iiab · holta · Jan 2, 2020 · Dec 4, 2019 · Dec 4, 2019 · Dec 4, 2019
diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
@@ -33,7 +33,7 @@
     state: present
   when: is_debuntu | bool
 
-- name: "Install 23 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sudo, tar, unzip, usbmount, usbutils, wget"
+- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3,sudo, tar, unzip, usbmount, usbutils, wget"
- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3,sudo, tar, unzip, usbmount, usbutils, wget"
+- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3, sudo, tar, unzip, usbmount, usbutils, wget"
- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3,sudo, tar, unzip, usbmount, usbutils, wget"
+- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3, sudo, tar, unzip, usbmount, usbutils, wget"
   package:
     name:
       - acpid
@@ -56,6 +56,7 @@
       - pandoc
       - pastebinit
       - rsync
+      - sqlite3
       - sudo
       - tar
       - unzip

diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml
@@ -18,9 +18,9 @@
 
 # To be ported soon
 - name: CAPTIVE PORTAL
-  include_tasks: roles/captive-portal/tasks/main.yml
-  when: captive_portal_install | bool
-  tags: base, captive-portal, network, domain
+  include_tasks: roles/captiveportal/tasks/main.yml
+  when: captiveportal_install | bool
+  tags: base, captiveportal, network, domain
 
 - name: MINETEST
   include_role:

diff --git a/roles/captive-portal/tasks/main.yml b/roles/captive-portal/tasks/main.yml
diff --git a/roles/captive-portal/templates/001-captive-portal.conf b/roles/captive-portal/templates/001-captive-portal.conf
diff --git a/roles/captive-portal/templates/captive-portal.service.j2.deprecated b/roles/captive-portal/templates/captive-portal.service.j2.deprecated
diff --git a/roles/captive-portal/templates/iiab-catch b/roles/captive-portal/templates/iiab-catch
diff --git a/roles/captive-portal/templates/iiab-uncatch b/roles/captive-portal/templates/iiab-uncatch
diff --git a/roles/captiveportal/README.md b/roles/captiveportal/README.md
@@ -0,0 +1,23 @@
+## Theory of Operation
+
+* The captive portal function is a feature of most modern operating systems. With the increased use of https/ssl (secure sockets layer), the automatic diversion to a specific web page runs the risk of being detected as a "man in the middle" attack.
+* Each Operating System (OS) provides a mechanism that IIAB can use to break into a conversation, when SSL is not being used. This is an initial attempt by the OS to talk to one of its own web sites, to determine if the host os is connected to the internet. It is always performed without SSL.
+* The IIAB captive portal uses a list of these OS supported web sites, and diverts these requests to the IIAB server, which in turn forwards to the IIAB home page.
+
+## Components of the IIAB Captive Portal
+
+* Files used
+    1. checkurls -- the list of urls use by at least one of the OS's.
+    1. iiab-divert-to-nginx -- Bash script writes dnsmasq config file which points to IIAB server
+    1. iiab-make-cp-servers.py -- Python script writes nginx configuration file to /etc/nginx/sites-enabled
+    1. capture-wsgi.py -- the script which determines the client agent, records it in sqlite database, and responds with redirects as appropriate for each OS.
+    1. uwsgi-captiveportal.service -- systemd unit file which runs uwsgi which makes capture-wsgi.py available on port 9090.
+
+ ## Extending and Debugging Captive Portal
+ * The python capture script can be run interactively in terminal (use systemctl stop uwsgi-captiveportal to free up the port). This will expose any python errors easily.
+ * Run the capture-wsgi.py with "-l" in a terminal to increase logging to /var/log/apache2/portal.log
+ * To discover untrapped urls, "apt-get install tcpdump", and "tcpdump -i br0 capture.tcp". I transfer this file to a machine with a GUI, and wireshark to interpret the conversations on the wire. The DNS packets are the ones to look for.
+
+ ## Known Problems
+ 1. On Android 5-7, the browser which is brought up, during the association process, is a 'walled garden' and I cannot find a way out. This browser is not very modern, and continuously displays the "sign in to Wi-Fi network" button -- with an annoying beep.
+ 2. On Windows 7, the default Internet Explorer (version 11) does not display the home page correctly. (but chrome, and firefox do).
diff --git a/roles/captive-portal/defaults/main.yml → roles/captiveportal/defaults/main.yml b/roles/captive-portal/defaults/main.yml → roles/captiveportal/defaults/main.yml
@@ -1,7 +1,7 @@
 # captive_portal_install: False
 # captive_portal_enabled: False
 
-# captive_portal_port: 9090
+# captiveportal_port: 9090
 
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
diff --git a/roles/captive-portal/files/mac.template → roles/captiveportal/files/mac.template b/roles/captive-portal/files/mac.template → roles/captiveportal/files/mac.template
diff --git a/roles/captive-portal/files/simple.template → roles/captiveportal/files/simple.template b/roles/captive-portal/files/simple.template → roles/captiveportal/files/simple.template