Merge pull request #25 from necro-nemesis/master

Merge master into Staging

config/dnsmasq.conf

@@ -1,7 +1,5 @@
 interface=wlan0
 dhcp-range=10.3.141.1,10.3.141.24,255.255.255.0,12h
 bind-dynamic
-no-negcache
-server=127.3.2.1
+server=/loki/127.3.2.1
 server=127.0.0.1
-server=1.1.1.1

config/head

@@ -0,0 +1 @@
+nameserver 127.3.2.1

config/lokilaunch.sh

@@ -7,33 +7,11 @@ case "$1" in
         lokinet > /dev/null 2>&1 &
         ;;
 
-  connect)
-        ehco -n "rerouted iptables\n"
-        sudo ip rule add from 10.3.141.1 lookup main prio 1000
-        echo -n "added wlan0 address rule\n"
-        sudo ip rule add from 10.3.141.0/24 lookup lokinet prio 1000
-        echo -n "added wifi-clients rule\n"
-        sleep 3
-        sudo ip route add default dev lokitun0 table lokinet
-        echo -n "added lokitun0 route\n"
-        echo -n "Restarting DNSMASQ\n"
-        ;;
-
   stop)
-        echo -n "Stopping LOKINET daemon\n"
+        echo -n "daemon stop command sent\n"
         pkill lokinet
         ;;
 
-disconnect)
-        sudo ip rule del from 10.3.141.1 lookup main prio 1000 #LOKIPAP
-        echo -n "removed wlan0 address rule\n"
-        sudo ip rule del from 10.3.141.0/24 lookup lokinet prio 1000 #LOKIPAP
-        echo -n "removed wifi-clients rule\n"
-        sudo ip route del default dev lokitun0 table lokinet
-        echo -n "removed lokitun0 route\n"
-        echo -n "Lokinet terminated - Network encryption services ended\n"
-        ;;
-
   gen)
         echo -n "NEW lokinet.ini FILE CREATED\n"
         lokinet "-g"
@@ -53,7 +31,7 @@ bootstrap)
         ;;
 
   *)
-        echo "Usage: "$1" {start|stop|gen|bootstrap|connect|disconnect}"
+        echo "Usage: "$1" {start|stop|gen|bootstrap}"
         exit 1
         ;;
         esac

config/on-down.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+# this will be overriden by on-up.sh

config/on-ready.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+notify-send "$@ Our Loki Address $LOKINET_ADDR is ready on address $IF_ADDR on $IF_NAME"

config/on-up.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -x
+gateway_route=$(ip route | grep ^default | grep via | head -n1)
+gateway_addr=$(echo "$gateway_route" | cut -d' ' -f3 )
+for addr in $STRICT_CONNECT_ADDRS ; do
+        sudo ip route add $(echo $addr | cut -d':' -f 1) via $gateway_addr
+done
+sudo ip route del $gateway_route
+sudo ip route add default dev lokitun0
+cat <<EOF > /root/.lokinet/on-down.sh
+#!/usr/bin/env bash
+set -x
+for addr in \$STRICT_CONNECT_ADDRS ; do
+        sudo ip route del \$(echo \$addr | cut -d':' -f 1) via $gateway_addr
+done
+sudo ip route del default dev lokitun0
+sudo ip route add $gateway_route
+
+EOF
+chmod +x /root/.lokinet/on-down.sh

config/rt_tables

@@ -1,12 +0,0 @@
-#
-# reserved values
-#
-2       lokinet
-255     local
-254     main
-253     default
-0       unspec
-#
-# local
-#
-#1      inr.ruhep

includes/functions.php

@@ -352,13 +352,13 @@ function DisplayLokinetConfig()
         $status = '<div class="alert alert-success alert-dismissable">Lokinet daemon is running
 					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
     }
-    if ($rulestate != "lokinet") {
+  /*  if ($rulestate != "lokinet") {
         $status = '<div class="alert alert-danger alert-dismissable">Not Connected to Lokinet
 					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
     } else {
         $status = '<div class="alert alert-success alert-dismissable">Successfully Connected to Lokinet
 					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
-    }
+    } */
 
      ?>
 	<div class="row">
@@ -379,21 +379,21 @@ function DisplayLokinetConfig()
            		<p><?php echo $status; ?></p>
             	<div class="tab-pane fade in active" id="basic">
                 <button type="button" class="btn btn-info" data-toggle="collapse" data-target="#instruct">Instructions</button>
-                <div id="instruct" class="collapse">All 4 buttons below must be active (green) to connect to Lokinet. If there isn't a current lokinet.ini file found on the system the "Generate.ini" button will be red. The .ini file must be generated first by pressing the button. Similarly the absense of a valid bootstrap will be indicated by the red "Bootstrap" button. Applying a bootstrap by pressing the apply button without submitting a valid URL in the textbox area will apply the original default bootstrap in place of one being provided. Stopping the daemon also exits Lokinet. If you simply exit Lokinet the daemon is left running in the background. So in summary if necessary generate the .ini and bootstrap then you are able to connect to lokinet and the daemon will be started.
+                <div id="instruct" class="collapse">The 3 buttons below must be active (green) to connect to Lokinet. If there isn't a current lokinet.ini file found on the system the "Generate.ini" button will be red. The .ini file must be generated prior to connecting to Lokinet by pressing the button which will automatically write the required .ini file. Similarly the absense of a valid bootstrap will be indicated by a red "Bootstrap" button. Applying a bootstrap by pressing the apply button without submitting a valid URL in the textbox area will apply the original default bootstrap in place of one being provided. Stopping the daemon also exits Lokinet. To summarize, if necessary generate the .ini and bootstrap Lokinet then you are able to connect to Lokinet by starting the daemon and letting the network establish itself.
                 </div>
                 <form role="form" action="?page=save_hostapd_conf" method="POST">
                   <div class="row">
                     <div class="form-group col-lg-12">
                       <h5>Enter a valid bootstrap url below and apply to overwrite the current bootstrap:</h5>
                         <label for="usr">Bootstrap url:</label>
-                        <input type="url" class="form-control" placeholder="http://206.81.100.174/n-st-5.signed" id="lokinetbootstrap" name="lokinetbootstrap">
+                        <input type="url" class="form-control" placeholder="https://seed.lokinet.org/bootstrap.signed" id="lokinetbootstrap" name="lokinetbootstrap">
                   <?php
 
-                  if ($rulestate != "lokinet") {
+                /*  if ($rulestate != "lokinet") {
                       echo '<input type="submit" class="btn btn-danger" name="UseLokinet" value="Use Lokinet" />' , PHP_EOL;
                   } else {
                       echo '<input type="submit" class="btn btn-success" name="ExitLokinet" value="Exit Lokinet" />' , PHP_EOL;
-                  }
+                  } */
                   if ($lokinetstatus[0] == 0) {
                       echo '<input type="submit" class="btn btn-danger" name="StartDaemon" value="Start Daemon" />' , PHP_EOL;
                   } else {
@@ -611,23 +611,25 @@ function SaveTORAndVPNConfig()
     } elseif (isset($_POST['StartDaemon'])) {
         ?>
     <div class="alert alert-success">
-      Starting Lokinet background daemon process.
+      Launching Lokinet.
     </div>
     <?php
-    /*$output = shell_exec('sudo /etc/init.d/dnsmasq stop');
-    echo "<pre><strong>$output</strong></pre>";*/
+/*    $output = shell_exec('sudo /etc/init.d/dnsmasq stop');
+    echo "<pre><strong>$output</strong></pre>";
+*/
     $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh start');
     echo "<pre><strong>$output</strong></pre>";
-    /*$output = shell_exec('sudo /etc/init.d/dnsmasq start');
-    echo "<pre><strong>$output</strong></pre>";*/
+/*  $output = shell_exec('sudo /etc/init.d/dnsmasq start');
+    echo "<pre><strong>$output</strong></pre>";
+*/
   } elseif (isset($_POST['StopDaemon'])) {
         ?>
     <div class="alert alert-danger">
           Exiting Lokinet.
     </div>
     <?php
-    $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh disconnect');
-    echo "<pre><strong>$output</strong></pre>";
+  /*  $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh disconnect');
+    echo "<pre><strong>$output</strong></pre>"; */
     ?>
     <div class="alert alert-danger">
       Stopping Lokinet background daemon process.
@@ -635,7 +637,7 @@ function SaveTORAndVPNConfig()
     <?php
     $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh stop');
     echo "<pre><strong>$output</strong></pre>";
-
+/*
   } elseif (isset($_POST['UseLokinet'])) {
       ?>
   <div class="alert alert-success">
@@ -648,13 +650,15 @@ function SaveTORAndVPNConfig()
   if ($lokinetstatus[0] == 0){
     $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh start');
     echo "<pre><strong>$output</strong></pre>";
-  }
+
   $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh connect');
   echo "<pre><strong>$output</strong></pre>";
   $output = shell_exec('sudo /etc/init.d/dnsmasq start');
 # sleep(5);
 #  $output = shell_exec('sudo dnsmasq --interface=wlan0 --bind-interfaces --dhcp-range=10.3.141.0,10.3.141.24,12h --conf-file=/etc/resolv.conf');
   echo "<pre><strong>$output</strong></pre>";
+}
+
 } elseif (isset($_POST['ExitLokinet'])) {
       ?>
   <div class="alert alert-danger">
@@ -663,7 +667,7 @@ function SaveTORAndVPNConfig()
   <?php
   $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh disconnect');
   echo "<pre><strong>$output</strong></pre>";
-
+*/
     } elseif (isset($_POST['GenerateLokinet'])) {
         ?>
     <div class="alert alert-success">
@@ -686,8 +690,9 @@ function SaveTORAndVPNConfig()
         Exiting Lokinet.
   </div>
   <?php
-  $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh disconnect');
+/*  $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh disconnect');
   echo "<pre><strong>$output</strong></pre>";
+*/
   ?>
   <div class="alert alert-danger">
     Stopping Lokinet background daemon process.

installers/common.sh

@@ -1,25 +1,29 @@
-# test staging push
 raspap_dir="/etc/raspap"
 raspap_user="www-data"
+webroot_dir="/var/www/html"
 version=`sed 's/\..*//' /etc/debian_version`
 
 # Determine version, set default home location for lighttpd and
 # php package to install
-webroot_dir="/var/www/html"
-if [ $version -eq 9 ]; then
-    version_msg="Raspian 9.0 (Stretch)"
+if [ $version -eq 10 ]; then
+    version_msg="Raspbian 10.0 (Buster)"
+    php_package="php7.1-cgi"
+elif [ $version -eq 9 ]; then
+    version_msg="Raspbian 9.0 (Stretch)"
     php_package="php7.0-cgi"
 elif [ $version -eq 8 ]; then
-    version_msg="Raspian 8.0 (Jessie)"
+    version_msg="Raspbian 8.0 (Jessie)"
     php_package="php5-cgi"
 else
-    version_msg="Raspian earlier than 8.0 (Wheezy)"
+    version_msg="Raspbian earlier than 8.0 (Wheezy)"
     webroot_dir="/var/www"
     php_package="php5-cgi"
 fi
 
 phpcgiconf=""
-if [ "$php_package" = "php7.0-cgi" ]; then
+if [ "$php_package" = "php7.1-cgi" ]; then
+    phpcgiconf="/etc/php/7.1/cgi/php.ini"
+elif [ "$php_package" = "php7.0-cgi" ]; then
     phpcgiconf="/etc/php/7.0/cgi/php.ini"
 elif [ "$php_package" = "php5-cgi" ]; then
     phpcgiconf="/etc/php5/cgi/php.ini"
@@ -197,14 +201,29 @@ function default_configuration() {
     sudo mv $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || install_error "Unable to move hostapd configuration file"
     sudo mv $webroot_dir/config/dnsmasq.conf /etc/dnsmasq.conf || install_error "Unable to move dnsmasq configuration file"
     sudo mv $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || install_error "Unable to move dhcpcd configuration file"
-    sudo mv $webroot_dir/config/rt_tables /etc/iproute2/ || install_error "Unable to move dhcpcd configuration file"
+    sudo mv $webroot_dir/config/head /etc/resolvconf/resolv.conf.d/head || install_error "Unable to move resolvconf head file"
+    sudo resolvconf -u || install_error "Unable to update resolv.conf"
+
+
+    # LokiPAP Batch file relocation and permissions in user loki-network directory
+
+    sudo mv $webroot_dir/config/lokilaunch.sh $HOME/loki-network/ || install error "Unable to move lokilaunch.sh, install Lokinet first"
 
+    # Forces all traffic through Lokinet (drop scripts into root's .lokinet folder)
 
-  # LokiPAP Batch file relocation and permissions in user loki-network directory
+      sudo mv $webroot_dir/config/on-up.sh /root/.lokinet/on-up.sh || install error "Unable to move on-up.sh, install Lokinet first"
+      sudo mv $webroot_dir/config/on-down.sh /root/.lokinet/on-down.sh || install error "Unable to move on-down.sh, install Lokinet first"
+      sudo mv $webroot_dir/config/on-ready.sh /root/.lokinet/on-ready.sh || install error "Unable to move on-ready.sh, install Lokinet first"
+
+    #changes persmission on lokilaunch.sh
 
-    sudo mv $webroot_dir/config/lokilaunch.sh $HOME/loki-network/ || install error "Unable to move, install Lokinet first"
     sudo chmod 755 $HOME/loki-network/lokilaunch.sh
-    # sudo chown $raspap_user:$raspap_user lokilaunch.sh
+
+    # Forces all traffic through Lokinet (change permissions)
+
+      sudo chmod 755 /root/.lokinet/on-up.sh
+      sudo chmod 755 /root/.lokinet/on-down.sh
+      sudo chmod 755 /root/.lokinet/on-ready.sh
 
     # Generate required lines for Rasp AP to place into rc.local file.
     # #RASPAP is for removal script
@@ -213,8 +232,6 @@ function default_configuration() {
     'iptables -t nat -A POSTROUTING -s 10.3.141.0\/24 -o lokitun0 -j MASQUERADE #RASPAP'
     'iptables -t nat -A POSTROUTING -j MASQUERADE #RASPAP'
     'sudo \/home\/pi\/loki-network\/.\/lokilaunch.sh start #RASPAP'
-    'sudo \/home\/pi\/loki-network\/.\/lokilaunch.sh connect #RASPAP'
-
 
     )
 
@@ -243,6 +260,9 @@ function patch_system_files() {
     # Set commands array
     cmds=(
         "/home/pi/loki-network/lokilaunch.sh*"
+          #added for forced Lokinet
+        "/sbin/ip"
+          #
         "/sbin/ifdown"
         "/sbin/ifup"
         "/bin/cat /etc/wpa_supplicant/wpa_supplicant.conf"

installers/raspbian.sh

@@ -9,7 +9,7 @@ function update_system_packages() {
 
 function install_dependencies() {
     install_log "Installing required packages"
-    sudo apt-get install lighttpd $php_package git hostapd dnsmasq vnstat || install_error "Unable to install dependencies"
+    sudo apt-get install lighttpd $php_package git hostapd dnsmasq vnstat resolvconf || install_error "Unable to install dependencies"
 }
 
 install_raspap