Initial attempt at captive portal with configurable port during setup and in .conf file

Author: jasbur

initial_setup.py

@@ -16,6 +16,8 @@
 print()
 auto_config_delay = input("How long of a delay would you like without an active connection \nbefore auto-reconfiguration triggers (seconds)? [default: 300]: ")
 print()
+server_port_choice = input("Which port would you like to use for the Configuration Page? [default: 80]: ")
+print()
 ssl_enabled_choice = input("Would you like to enable SSL during configuration mode \n(NOTICE: you will get a certificate ID error \nwhen connecting, but traffic will be encrypted) [y/N]?: ")
 os.system('clear')
 print()
@@ -25,7 +27,7 @@
 if(install_ans.lower() == 'y'):
 	setup_lib.install_prereqs()
 	setup_lib.copy_configs()
-	setup_lib.update_main_config_file(entered_ssid, auto_config_choice, auto_config_delay, ssl_enabled_choice)
+	setup_lib.update_main_config_file(entered_ssid, auto_config_choice, auto_config_delay, ssl_enabled_choice, server_port_choice)
 else:
 	print()
 	print()

libs/configuration_app/app.py

@@ -91,6 +91,6 @@ def config_file_hash():
     config_hash = config_file_hash()
 
     if config_hash['ssl_enabled'] == "1":
-        app.run(host = '0.0.0.0', port = 9191, ssl_context='adhoc')
+        app.run(host = '0.0.0.0', port = config_hash['server_port'], ssl_context='adhoc')
     else:
-        app.run(host = '0.0.0.0', port = 9191)
+        app.run(host = '0.0.0.0', port = config_hash['server_port'])

libs/reset_device/static_files/dnsmasq.conf

@@ -6,3 +6,5 @@ dhcp-range=10.0.0.10,10.0.0.15,12h
 # Delays sending DHCPOFFER and proxydhcp replies for at least the specified number of seconds.
 dhcp-mac=set:client_is_a_pi,B8:27:EB:*:*:*
 dhcp-reply-delay=tag:client_is_a_pi,2
+
+address=/raspiwifisetup.com/10.0.0.1

libs/reset_device/static_files/raspiwifi.conf

@@ -2,3 +2,4 @@ ssid_prefix=RaspiWiFi Setup
 auto_config=0
 auto_config_delay=300
 ssl_enabled=0
+server_port=80

setup_lib.py

@@ -29,7 +29,7 @@ def copy_configs():
 	os.system('echo "@reboot root run-parts /etc/cron.raspiwifi/" >> /etc/crontab')
 	os.system('mv /usr/lib/raspiwifi/reset_device/static_files/raspiwifi.conf /etc/raspiwifi')
 
-def update_main_config_file(entered_ssid, auto_config_choice, auto_config_delay, ssl_enabled_choice):
+def update_main_config_file(entered_ssid, auto_config_choice, auto_config_delay, ssl_enabled_choice, server_port_choice):
 	if entered_ssid != "":
 		os.system('sed -i \'s/RaspiWiFi Setup/' + entered_ssid + '/\' /etc/raspiwifi/raspiwifi.conf')
 	if auto_config_choice.lower() == "y":
@@ -38,3 +38,5 @@ def update_main_config_file(entered_ssid, auto_config_choice, auto_config_delay,
 		os.system('sed -i \'s/auto_config_delay=300/auto_config_delay=' + auto_config_delay + '/\' /etc/raspiwifi/raspiwifi.conf')
 	if ssl_enabled_choice.lower() == "y":
 		os.system('sed -i \'s/ssl_enabled=0/ssl_enabled=1/\' /etc/raspiwifi/raspiwifi.conf')
+	if server_port_choice != "":
+		os.system('sed -i \'s/server_port=80/server_port=' + server_port_choice + '/\' /etc/raspiwifi/raspiwifi.conf')