adjustments to code that requires root privileges

Author: jmstriegel

coder-base/apps/auth/app.js

@@ -32,7 +32,6 @@ var device_settings = {
     coder_color: '#3e3e3e'
 };
 
-var setpipass = '/home/coder/coder-dist/coder-base/sudo_scripts/setpipass';
 
 exports.settings={};
 //These are dynamically updated by the runtime
@@ -346,6 +345,7 @@ exports.api_addpassword_handler = function( req, res ) {
     //device_settings.device_name = devicename;
     var erroutput = "";
     var output = "";
+    var setpipass = process.cwd() + '/sudo_scripts/setpipass';
     var setpass = spawn( '/usr/bin/sudo', [setpipass] );
     setpass.stdout.on( 'data', function( d ) {
         output += d;
@@ -430,6 +430,7 @@ exports.api_changepassword_handler = function( req, res ) {
     //device_settings.device_name = devicename;
     var erroutput = "";
     var output = "";
+    var setpipass = process.cwd() + '/sudo_scripts/setpipass';
     var setpass = spawn( '/usr/bin/sudo', [setpipass] );
     setpass.stdout.on( 'data', function( d ) {
         output += d;

coder-base/apps/wifi/app.js

@@ -22,6 +22,8 @@ var mustache = require('mustache');
 var util = require('util');
 var fs = require('fs');
 
+var sudoscripts = process.cwd() + '/sudo_scripts';
+
 exports.settings={};
 //These are dynamically updated by the runtime
 //settings.appname - the app id (folder) where your app is installed
@@ -154,7 +156,7 @@ var saveWifiConfigEntry = function( configdata ) {
 
 exports.api_reboot_handler = function( req, res ) {
     var spawn = require('child_process').spawn;
-    var rebootproc = spawn( '/sbin/shutdown', ['-r', 'now'] );
+    var rebootproc = spawn( '/usr/bin/sudo', [ sudoscripts + '/reboot'] );
     rebootproc.addListener( 'exit', function( code, signal ) {
         res.json( { status: 'success' } );
     });        
@@ -166,19 +168,19 @@ exports.api_wifi_list_handler = function( req, res ) {
     var data = "";
 
     var scanStep1 = function( ) {
-        var scanproc = spawn( '/sbin/wpa_cli', ['ap_scan', '2'] );
+        var scanproc = spawn( '/usr/bin/sudo', [ sudoscripts + '/wpa_cli_apscan'] );
         scanproc.addListener( 'exit', function( code, signal ) {
             scanStep2();
         });        
     };
     var scanStep2 = function( ) {
-        var scanproc = spawn( '/sbin/wpa_cli', ['scan'] );
+        var scanproc = spawn( '/usr/bin/sudo', [ sudoscripts + '/wpa_cli_scan'] );
         scanproc.addListener( 'exit', function( code, signal ) {
             scanStep3();
         });        
     };
     var scanStep3 = function( ) {
-        var scanproc = spawn( '/sbin/wpa_cli', ['scan_results'] );
+        var scanproc = spawn( '/usr/bin/sudo', [ sudoscripts + '/wpa_cli_scanresults'] );
         scanproc.stdout.on( 'data', function(d) { data += d; } );        
         scanproc.addListener( 'exit', function( code, signal ) {
             returnData();

coder-base/sudo_scripts/reboot

@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/shutdown -r now

coder-base/sudo_scripts/wpa_cli_apscan

@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/wpa_cli scan

coder-base/sudo_scripts/wpa_cli_scan

@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/wpa_cli ap_scan 2

coder-base/sudo_scripts/wpa_cli_scanresults

@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/wpa_cli scan_results

raspbian-addons/etc/init.d/pull-coder-reset

@@ -24,7 +24,8 @@ dest_device_json="/home/coder/coder-dist/coder-base/device.json"
 if [ -f $reset_file ]; then
 	echo "-----RESET WPA_SUPPLICANT.CONF-----" | $logger
 	cp $source_wpa_conf $dest_wpa_conf
-	chmod 600 $dest_wpa_conf
+	chown root:wpaconfig $dest_wpa_conf
+	chmod 660 $dest_wpa_conf
 	echo "-----RESET DEVICE.JSON-----" | $logger
 	cp $source_device_json $dest_device_json
 	chown coder $dest_device_json

raspbian-addons/etc/init.d/pull-wpa-supplicant

@@ -21,7 +21,8 @@ dest_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
 if [ -f $source_conf ]; then
 	echo "-----IMPORTING WPA_SUPPLICANT.CONF FROM SD-----" | $logger
 	cp $source_conf $dest_conf
-	chmod 600 $dest_conf
+	chown root:wpaconfig $dest_conf
+	chmod 660 $dest_conf
 	rm -f $source_conf
 fi