added sync+init (with new system for init a machine : unlock code)

lib/api/init

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/env php $(realpath $(dirname $0))/source/init.php;

lib/api/source/init.php

@@ -0,0 +1,150 @@
+<?php
+
+	require_once __DIR__.'/../../include/php/const';
+
+	function api_init(){
+
+		/* [1] Fetch & generate useful data
+		=========================================================*/
+		/* (1) Fetch target url */
+		$url = @file_get_contents(URL_CONF);
+
+		if( $url === false ){
+			slog("Cannot find server's api url", 'api:init','update');
+			return 127;
+		}
+
+		// remove unwanted spaces or linebreaks
+		$url = preg_replace('/\s/', '', $url).'/init';
+
+
+		/* (2) Fetch machine id */
+		$id_machine = @file_get_contents(ID_CONF);
+
+		if( $id_machine === false ){
+			slog("Cannot find machine id", 'api:init','update');
+			return 127;
+		}
+
+
+
+		/* (3) Fetch cyclic hash */
+		$hash = syscall(SOURCE_DIR.'/lib/cyclic-hash/hash');
+
+		if( strlen($hash) != 128 ){
+			slog("Wrong hash length (".strlen($hash).")", 'api:init','update');
+			return 127;
+		}
+
+		/* (4) Try new hash if available */
+		$new = syscall(SOURCE_DIR.'/lib/cyclic-hash/new');
+		
+		if( $new === false ){
+			slog("cyclic-hash:new returned $new EXIT_STATUS", 'api:init','update');
+			return 127;
+		}
+
+		/* (5) Fetch machine unlock code */
+		$unlock_code = @file_get_contents(ID_CONF);
+
+		if( $unlock_code === false ){
+			slog("Cannot find unlock code", 'api:init','update');
+			return 127;
+		}
+
+
+		
+
+		/* [2] Create httpRequest base
+		=========================================================*/
+		/* (1) Set URL */
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_URL, $url);
+
+		/* (2) Set HTTP method -> POST */
+		curl_setopt($curl, CURLOPT_POST, true);
+
+		/* (3) Additional options */
+		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+
+
+
+		/* [3] Manage post data
+		=========================================================*/
+		/* (1) Set post data */
+		$postarray = [
+			'id_machine' => $id_machine,
+			'token'      => $hash,
+			'unlock'     => $unlock_code
+		];
+
+		/* (2) Add new hash if renew */
+		if( strlen($new) == 128 )
+			$postarray['token'] = $new;
+
+		/* (3) Set postdata raw to curl */
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $postarray);
+
+
+		/* [4] Manage authentication
+		=========================================================*/
+		/* (1) Fetch warehouse token */
+		$wh_tok = @file_get_contents(WAREHOUSE_TOK);
+
+		if( $wh_tok === false ){
+			slog("Cannot find warehouse token", 'api:init','update');
+			return 127;
+		}
+
+		/* (2) Set Auth header digest */
+		curl_setopt($curl, CURLOPT_HTTPHEADER, [
+			"Authorization: Digest $wh_tok"
+		]);
+
+
+		/* [5] Send and catch request response
+		=========================================================*/
+		/* (1) Send and catch response */
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		$response = curl_exec($curl);
+
+		/* (2) Close request */
+		curl_close($curl);
+		
+		/* (3) Return response as result */
+		if( $response === false ){
+			slog("Request error", 'api:init','update');
+			return 127;
+		}
+
+
+
+		/* [6] Decrement cyclic-hash so request has ran successfully
+		=========================================================*/
+		/* (1) Decrement the hash */
+		$decr = syscall(SOURCE_DIR.'/lib/cyclic-hash/decr');
+
+		if( $decr === false ){
+			slog("cyclic-hash:decr returned $decr EXIT_STATUS", 'api:init','update');
+			return 127;
+		}
+
+		
+		/* [6] Response management
+		=========================================================*/
+		/* (1) Writes request to temporary pipe */
+		file_put_contents(TMP_DIR.'/api.response', $response);
+
+		/* (2) Manage response deployement */
+		$deploy = syscall(SOURCE_DIR.'/lib/api/deploy');
+		
+		/* (3) Return state */
+		return ($deploy === true) ? 0 : 127;
+	
+	}
+
+	echo api_init();
+	
+	
+
+?>

lib/api/source/sync.php

@@ -15,13 +15,14 @@
 		}
 
 		// remove unwanted spaces or linebreaks
-		$url = preg_replace('/\s/', '', $url);
+		$url = preg_replace('/\s/', '', $url).'/sync';
+
 
 		/* (2) Fetch cyclic hash */
 		$hash = syscall(SOURCE_DIR.'/lib/cyclic-hash/hash');
 
 		if( strlen($hash) != 128 ){
-			slog("Wrong cyclic-hash:hash hash length (".strlen($hash).")", 'api:sync','update');
+			slog("Wrong hash length (".strlen($hash).")", 'api:sync','update');
 			return 127;
 		}
 
@@ -33,10 +34,7 @@
 			return 127;
 		}
 
-		/* (4) Generate the multipart boundary */
+		/* (4) Fetch data */
-		$boundary = 'boundary--'.hash('sha512', uniqid()).'--boundary';
-
-		/* (5) Fetch data */
 		$data = json_decode(syscall(SOURCE_DIR.'/lib/api/fetch'));
 
 		if( is_null($data) ){
@@ -47,7 +45,7 @@
 
 		
 
-		/* [2] Create httpRequest basis
+		/* [2] Create httpRequest base
 		=========================================================*/
 		/* (1) Set URL */
 		$curl = curl_init();
@@ -56,6 +54,9 @@
 		/* (2) Set HTTP method -> POST */
 		curl_setopt($curl, CURLOPT_POST, true);
 
+		/* (3) Additional options */
+		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+
 
 
 		/* [3] Manage post data
@@ -74,14 +75,30 @@
 		curl_setopt($curl, CURLOPT_POSTFIELDS, $postarray);
 
 
-		/* [4] Send and catch request response
+		/* [4] Manage authentication
+		=========================================================*/
+		/* (1) Fetch warehouse token */
+		$wh_tok = @file_get_contents(WAREHOUSE_TOK);
+
+		if( $wh_tok === false ){
+			slog("Cannot find warehouse token", 'api:sync','update');
+			return 127;
+		}
+
+		/* (2) Set Auth header digest */
+		curl_setopt($curl, CURLOPT_HTTPHEADER, [
+			"Authorization: Digest $wh_tok"
+		]);
+
+
+		/* [5] Send and catch request response
 		=========================================================*/
 		/* (1) Send and catch response */
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 		$response = curl_exec($curl);
 
 		/* (2) Close request */
-		//curl_close($curl);
+		curl_close($curl);
 		
 		/* (3) Return response as result */
 		if( $response === false ){
@@ -90,7 +107,8 @@
 		}
 
 
-		/* [5] Decrement cyclic-hash so request has ran successfully
+
+		/* [6] Decrement cyclic-hash so request has ran successfully
 		=========================================================*/
 		/* (1) Decrement the hash */
 		$decr = syscall(SOURCE_DIR.'/lib/cyclic-hash/decr');
@@ -101,11 +119,7 @@
 		}
 
 		
-
+		/* [6] Response management
-		
-
-		
-		/* [5] Response management
 		=========================================================*/
 		/* (1) Writes request to temporary pipe */
 		file_put_contents(TMP_DIR.'/api.response', $response);
@@ -114,7 +128,7 @@
 		$deploy = syscall(SOURCE_DIR.'/lib/api/deploy');
 		
 		/* (3) Return state */
-		return ($deploy === true);
+		return ($deploy === true) ? 0 : 127;
 	
 	}
 

lib/include/bash/const

@@ -19,6 +19,7 @@ export BRANCH_CONF="$CONF_DIR/machine.branch";
 export ID_CONF="$CONF_DIR/machine.id";
 export URL_CONF="$CONF_DIR/api.url";
 export AUTH_CONF="$CONF_DIR/auth.list";
+export WAREHOUSE_TOK="$CONF_DIR/warehouse.token";
 
 # LOG FILES
 export BOOT_LOG="$LOG_DIR/boot.log";

lib/include/php/const

@@ -9,7 +9,7 @@
 	define('DATA_DIR', ROOT_DIR.'/data');
 	define('CONF_DIR', ROOT_DIR.'/conf');
 	#define('SOURCE_DIR', ROOT_DIR.'/source');
-	define('SOURCE_DIR', '/home/xdrm-brackets/Desktop/git.xdr/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats');
+	define('SOURCE_DIR', '/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats');
 	define('TMP_DIR', ROOT_DIR.'/tmp');
 
 	# CONFIGURATION FILES
@@ -19,6 +19,7 @@
 	define('ID_CONF', CONF_DIR.'/machine.id');
 	define('URL_CONF', CONF_DIR.'/api.url');
 	define('AUTH_CONF', CONF_DIR.'/auth.list');
+	define('WAREHOUSE_TOK', CONF_DIR.'/warehouse.token');
 
 	# LOG FILES
 	define('BOOT_LOG', LOG_DIR.'/boot.log');