WIP put identity.php and identitylib.php in public file

Parag Padsumbiya · Parag Padsumbiya · commit 90774c9b75e2 · 2021-04-06T17:06:05.000+05:30
diff --git a/qpkg.cfg b/qpkg.cfg
@@ -1,9 +1,9 @@
 # Name of the packaged application.
-QPKG_NAME="STORJ_LUMEN"
+QPKG_NAME="STORJ"
 # Name of the display application.
 QPKG_DISPLAY_NAME="Storj Storage Node"
 # Version of the packaged application. 
-QPKG_VER="0.0.1"
+QPKG_VER="1.1.2"
 # Author or maintainer of the package
 QPKG_AUTHOR="Utropicmedia"
 # License for the packaged application
@@ -29,7 +29,7 @@ QPKG_REQUIRE="container-station >= 1.7.2041"
 # Location of file with running service's PID
 #QPKG_SERVICE_PIDFILE=""
 # Relative path to web interface
-QPKG_WEBUI="/STORJ_LUMEN/"
+QPKG_WEBUI="/STORJ/"
 # Port number for the web interface.
 #QPKG_WEB_PORT=""
 # Port number for the SSL web interface.
diff --git a/shared/STORJ.sh b/shared/STORJ.sh
@@ -1,40 +1,40 @@
 #!/bin/sh
 CONF=/etc/config/qpkg.conf
-QPKG_NAME="STORJ_LUMEN"
+QPKG_NAME="STORJ"
 LOGFILE=/var/log/${QPKG_NAME}
 QPKG_ROOT=`/sbin/getcfg $QPKG_NAME Install_Path -f ${CONF}`
 APACHE_ROOT=`/sbin/getcfg SHARE_DEF defWeb -d Qweb -f /etc/config/def_share.info`
 export QNAP_QPKG=$QPKG_NAME
 
 case "$1" in
   start)
-    echo `date` " STORJ_LUMEN : Request to start ($@) " >> $LOGFILE
+    echo `date` " STORJ : Request to start ($@) " >> $LOGFILE
     ENABLED=$(/sbin/getcfg $QPKG_NAME Enable -u -d FALSE -f $CONF)
     if [ "$ENABLED" != "TRUE" ]; then
         echo "$QPKG_NAME is disabled."
-	echo `date` " STORJ_LUMEN : $PKG_NAME is disabled " >> $LOGFILE
+	echo `date` " STORJ : $PKG_NAME is disabled " >> $LOGFILE
         exit 1
     fi
     : ADD START ACTIONS HERE
     echo `date` "Create $QPKG_ROOT/web/public folder link to STORJ folder " >> /tmp/runSTORJ.log
-    ln -s $QPKG_ROOT/web/public /home/Qhttpd/Web/STORJ_LUMEN
-    echo `date` " STORJ_LUMEN : Request to start ($@) completed " >> $LOGFILE
+    ln -s $QPKG_ROOT/web/public /home/Qhttpd/Web/STORJ
+    echo `date` " STORJ : Request to start ($@) completed " >> $LOGFILE
     ;;
 
   stop)
-    echo `date` " STORJ_LUMEN : Request to stop ($@) " >> $LOGFILE
+    echo `date` " STORJ : Request to stop ($@) " >> $LOGFILE
     : ADD STOP ACTIONS HERE
-    rm /home/Qhttpd/Web/STORJ_LUMEN
+    rm /home/Qhttpd/Web/STORJ
     ;;
 
   restart)
-    echo `date` " STORJ_LUMEN : Request restart ($@) " >> $LOGFILE
+    echo `date` " STORJ : Request restart ($@) " >> $LOGFILE
     $0 stop
     $0 start
     ;;
 
   *)
-    echo `date` " STORJ_LUMEN : Request UNKNOWN ($@) " >> $LOGFILE
+    echo `date` " STORJ : Request UNKNOWN ($@) " >> $LOGFILE
     echo "Usage: $0 {start|stop|restart}"
     exit 1
 esac
diff --git a/shared/web/app/Helpers/IdentityHelper.php b/shared/web/app/Helpers/IdentityHelper.php
@@ -44,7 +44,7 @@ public function killIdentityProcess($identityPidFile) {
     public function checkIdentityFileExistence($data) {
         // Checking file if exist or not.
         $identityFilePath = $data["Identity"] . "/storagenode/identity.key";
-        if (validateExistence($data)) {
+        if ($this->validateExistence($data)) {
             $this->logMessage("(file_exist) File $identityFilePath and others already exist !");
             echo "0";   # NORMAL
         } else {
@@ -109,13 +109,13 @@ public function storeConfig($data, $filePath) {
     }
 
     public function updateConfig($dataNew, $filePath) {
-        $data = loadConfig($filePath);
+        $data = $this->loadConfig($filePath);
         $data = array_merge($data, $dataNew);
         $this->storeConfig($data, $filePath);
     }
 
     public function updateConfigKey($key, $value, $filePath) {
-        $data = loadConfig($filePath);
+        $data = $this->loadConfig($filePath);
         $data[$key] = $value;
         $this->storeConfig($data, $filePath);
     }
diff --git a/shared/web/app/Http/Controllers/IdentityController.php b/shared/web/app/Http/Controllers/IdentityController.php
@@ -23,16 +23,17 @@ public function __construct(IdentityHelper $identityHelper) {
      *
      */
     public function index(Request $request) {
-        //  Set variables
+
+        $platformBase = filter_input(INPUT_SERVER, 'DOCUMENT_ROOT');
+        $moduleBase = $platformBase . dirname(filter_input(INPUT_SERVER, 'PHP_SELF'));
         $configBase = env('CONFIG_DIR', "/share/Public/storagenode.conf");
-        $scriptsBase = base_path('public/scripts');
+        $scriptsBase = $moduleBase . '/scripts';
         $identityGenBinary = env('IDENTITY_GEN_BINARY', "/share/Public/identity.bin/identity");
         $logFile = env('IDENTITY_LOG', "share/Public/identity/logs/storj_identity.log");
 
-
         $data = $this->identityHelper->loadConfig("${configBase}/config.json");
-        // Update config json file if updates provided
-        $inputs = $request->all();
+        # Update config json file if updates provided
+        $inputs = $this->identityHelper->loadConfig("php://input");
         if (isset($inputs['authkey']) || isset($inputs['identity'])) {
             // Saving Identity Path and Auth Key in JSON file.
             if (isset($inputs["authkey"])) {
@@ -41,22 +42,22 @@ public function index(Request $request) {
             if (isset($inputs["identity"])) {
                 $data['Identity'] = $inputs["identity"];
             }
-            $this->identityHelper->storeConfig($data, "${configBase}/config.json");
+            $this->identityHelper->storeConfig($data, "config.json");
         }
 
         $identityGenScriptPath = $scriptsBase . DIRECTORY_SEPARATOR . 'generateIdentity.sh';
         $Path = $data["Identity"] . "/storagenode";
         $identityFilePath = "${Path}/identity.key";
-        $urlToFetch = env('IDENTITY_URL', "https://github.com/storj/storj/releases/latest/download/identity_linux_amd64.zip");
-        $identitypidFile = url('identity.pid');
-
+        $urlToFetch = "https://github.com/storj/storj/releases/latest/download/identity_linux_amd64.zip";
+        $identitypidFile = $moduleBase . DIRECTORY_SEPARATOR . 'identity.pid';
 
+        # ------------------------------------------------------------------------
 
         $date = Date('Y-m-d H:i:s');
         $output = "";
-        $configFile = "${configBase}/config.json";
+        $configFile = "config.json";
 
-        $inputs = $request->all();
+        $inputs = $this->identityHelper->loadConfig("php://input");
 
 
         $this->identityHelper->logMessage("================== identity.php invoked ================== ");
@@ -112,12 +113,12 @@ public function index(Request $request) {
 
             $this->identityHelper->logMessage("Invoked identity generation program ($identityGenScriptPath) ");
             echo $lastline;
-        } else if (isset($inputs['status'])) {
+        } else if (filter_input(INPUT_POST, 'status') || isset($inputs['status'])) {
             $this->identityHelper->logMessage("Identity php called for fetching STATUS!");
-            $data['LogFilePath'] = $logFile;
-            $data['idGenStartTime'] = $date;
+
             $file = $data['LogFilePath'];
-            $pid = file_get_contents("identity.pid");
+
+            $pid = file_get_contents($identitypidFile);
             $prgStartTime = $data['idGenStartTime'];
             $file = escapeshellarg($file);
             $lastline = `tail -c160 $file | sed -e 's#\\r#\\n#g' | tail -1 `;
@@ -131,11 +132,10 @@ public function index(Request $request) {
                 $this->identityHelper->logMessage("identity available at ${identityFilePath}");
                 echo "identity available at ${identityFilePath}";
             } else {
-                $data = $this->identityHelper->loadConfig($configFile);
-                $data['idGenStartTime'] = $date;
+                $data = $this->identityHelper->loadConfig("/share/Public/storagenode.conf/config.json");
                 $lastline = preg_replace('/\n$/', '', $lastline);
                 $this->identityHelper->logMessage("STATUS: Identity generation in progress (LOG: $lastline)");
-                echo "Identity generation STATUS($date):<BR> " .
+                echo "Identity generation STATUS a($date):<BR> " .
                 "Process ID: $pid , " .
                 "Started at: " . $data['idGenStartTime'] . "<BR>" . $lastline;
                 ?><div style="text-align: center"><img src="img/spinner.gif"></div><?php
diff --git a/shared/web/public/js/config.js b/shared/web/public/js/config.js
@@ -105,7 +105,7 @@ jQuery(function () {
             success: (result) => {
                 var str1 = result;
                 var str2 = "identity available";
-                if(str1.indexOf(str2) != -1) {
+                if (result === "identity available at /root/.local/share/storj/identity") {
                     $("#identity_status").html("<b>" + result + "</b>");
                     identitydataval = 1;
                 } else {
@@ -168,6 +168,8 @@ jQuery(function () {
                                 createVal = 1;
                             } else {
                                 $("#identity_status").html("Identity files exist.");
+                                $("#create_identity").attr("disabled", true);
+                                $("#create_identity").css("cursor", "not-allowed");
                                 createVal = 0;
                             }
                         },
@@ -183,8 +185,7 @@ jQuery(function () {
             } else {
                 readidentitystatus();
 
-                $("#create_identity").attr("disabled", true);
-                $("#create_identity").css("cursor", "not-allowed");
+                
                 $("#stop_identity").removeAttr("disabled");
                 $("#stop_identity").css("cursor", "pointer");
             }
