aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xapi/index.js1
-rw-r--r--api/lib/akLogMessage/index.js4
-rw-r--r--api/lib/checkIfAllowedIP/index.js5
-rw-r--r--api/lib/storeIncomingIP/index.js4
-rw-r--r--api/routes/announceZBlock/index.js4
-rw-r--r--api/routes/announceZChain/index.js4
-rw-r--r--api/routes/default/index.js5
-rw-r--r--api/routes/getChunk/index.js5
-rw-r--r--api/routes/getIPFSHash/index.js23
-rw-r--r--api/routes/getInnerIPFSContent/index.js4
-rw-r--r--api/routes/getLeaf/index.js4
-rw-r--r--api/routes/getMap/index.js5
-rw-r--r--api/routes/getNodeInfo/index.js4
-rw-r--r--api/routes/getPeers/index.js4
-rw-r--r--api/routes/getRemoteNodeInfo/index.js8
-rw-r--r--api/routes/getRemotePeers/index.js7
-rw-r--r--api/routes/getSBlock/index.js8
-rw-r--r--api/routes/getZChain/index.js5
-rw-r--r--api/routes/showEntriesFile/index.js6
-rw-r--r--api/routes/showNSEntriesFile/index.js6
-rw-r--r--api/validators/ZblockValidator/index.js4
-rw-r--r--api/validators/ZchainValidator/index.js5
-rwxr-xr-xlib/_ak_ns48
23 files changed, 98 insertions, 75 deletions
diff --git a/api/index.js b/api/index.js
index f5cf8c8..f2ca713 100755
--- a/api/index.js
+++ b/api/index.js
@@ -59,6 +59,7 @@ function getRoutes(req, res)
case 'peers': getPeers(req, res); break;
case 'node_info': getNodeInfo(req, res); break;
case 'ipfs_hash': getIPFSHash(req, res); break;
+ case 'ipfs': getIPFSHash(req, res); break;
case 'zlatest': getZlatest(req, res); break;
case 'sblock': getSblock(req, res); break;
case 'slatest': getSlatest(req, res); break;
diff --git a/api/lib/akLogMessage/index.js b/api/lib/akLogMessage/index.js
index 6dfb8f2..59a1300 100644
--- a/api/lib/akLogMessage/index.js
+++ b/api/lib/akLogMessage/index.js
@@ -1,7 +1,8 @@
const { spawn } = require('child_process');
const config = require('../../config')
-module.exports = (type, message) => {
+function akLogMessage(type, message)
+{
const command = spawn(
"ak-log",
["-m", "ak-daemon", type, message]
@@ -26,3 +27,4 @@ module.exports = (type, message) => {
console.log(`child process exited with code ${code}`);
});
};
+module.exports = akLogMessage;
diff --git a/api/lib/checkIfAllowedIP/index.js b/api/lib/checkIfAllowedIP/index.js
index d9693d9..2e50418 100644
--- a/api/lib/checkIfAllowedIP/index.js
+++ b/api/lib/checkIfAllowedIP/index.js
@@ -1,8 +1,9 @@
-
-module.exports = (address) => {
+function checkIfAllowedIP(address)
+{
var test_cjdns = /^fc[0-9a-z]{1,2}:([0-9a-z]{1,4}:){1,6}[0-9a-z]{1,4}/
var test_yggdrasil = /^2[0-9a-z]{1,2}:([0-9a-z]{1,4}:){1,6}[0-9a-z]{1,4}/
var test_yggdrasil_sub = /^3[0-9a-z]{1,2}:([0-9a-z]{1,4}:){1,6}[0-9a-z]{1,4}/
return (test_cjdns.test(address) || test_yggdrasil.test(address) || test_yggdrasil_sub.test(address)) ? true : false;
};
+module.exports = checkIfAllowedIP;
diff --git a/api/lib/storeIncomingIP/index.js b/api/lib/storeIncomingIP/index.js
index c45def6..72273d0 100644
--- a/api/lib/storeIncomingIP/index.js
+++ b/api/lib/storeIncomingIP/index.js
@@ -1,6 +1,8 @@
const fs = require("node:fs");
const config = require("../../config");
-module.exports = (ip_address) => {
+function storeIncomingIP(ip_address)
+{
fs.appendFileSync(`${config.peersDir}/incomingRequests`, `${ip_address}\n`);
}
+module.exports = storeIncomingIP;
diff --git a/api/routes/announceZBlock/index.js b/api/routes/announceZBlock/index.js
index 254e1dc..dc1467a 100644
--- a/api/routes/announceZBlock/index.js
+++ b/api/routes/announceZBlock/index.js
@@ -13,7 +13,8 @@
*
*/
const getvalidity = require('../../validators/ZblockValidator')
-module.exports = (req, res) => {
+function announceZBlock(req, res)
+{
console.log(req);
if ( (req.body.zblock) && typeof req.body.zblock === "string" && req.body.zblock.length === 46 ){
let zblock = req.body.zblock;
@@ -27,3 +28,4 @@ module.exports = (req, res) => {
res.send({error:"Invalid data"});
}
}
+module.exports = announceZBlock;
diff --git a/api/routes/announceZChain/index.js b/api/routes/announceZChain/index.js
index 0261aa4..ca23a72 100644
--- a/api/routes/announceZChain/index.js
+++ b/api/routes/announceZChain/index.js
@@ -14,7 +14,8 @@
*/
const getNSvalidity = require('../../validators/ZchainValidator');
-module.exports = (req, res) => {
+function announceZChain(req, res)
+{
console.log(req);
if ( (req.body.zchain) && typeof req.body.zchain === "string" && req.body.zchain.length === 62 ){
let zchain = req.body.zchain;
@@ -30,3 +31,4 @@ module.exports = (req, res) => {
res.end(JSON.stringify({error:"Invalid data"}));
}
}
+module.exports = announceZChain;
diff --git a/api/routes/default/index.js b/api/routes/default/index.js
index 24e334b..db1495f 100644
--- a/api/routes/default/index.js
+++ b/api/routes/default/index.js
@@ -1,7 +1,8 @@
const rsettings = require('../../settings');
const settings = rsettings();
-module.exports = (req, res) => {
+function welcome(req, res)
+{
res.writeHead(404, { 'Content-Type': 'application/json'});
res.end(JSON.stringify({
message:"Hello! Welcome to Arching Kaos API! See available routes below!",
@@ -36,4 +37,4 @@ module.exports = (req, res) => {
}
}));
}
-
+module.exports = welcome;
diff --git a/api/routes/getChunk/index.js b/api/routes/getChunk/index.js
index 6106aad..dc86bd8 100644
--- a/api/routes/getChunk/index.js
+++ b/api/routes/getChunk/index.js
@@ -7,7 +7,8 @@
const fs = require('fs');
const config = require("../../config.js");
-module.exports = (req, res) => {
+function getChunk(req, res)
+{
var args = req.url.split("/");
var hash = args[3];
regex= /[a-f0-9]{128}/
@@ -39,4 +40,4 @@ module.exports = (req, res) => {
res.end(JSON.stringify({error:"No hash"}));
}
}
-
+module.exports = getChunk;
diff --git a/api/routes/getIPFSHash/index.js b/api/routes/getIPFSHash/index.js
index f412c80..d1bdc5f 100644
--- a/api/routes/getIPFSHash/index.js
+++ b/api/routes/getIPFSHash/index.js
@@ -1,26 +1,29 @@
const { spawn } = require('child_process');
const fs = require("fs");
const config = require("../../config");
+const akLogMessage = require("../../lib/akLogMessage");
+akLogMessage('lol');
/*
- * Returns a cached zblock
+ * Returns a cached ipfs_hash
*
* Returns:
* - JSON object
*
*/
-function fetchIPFShash(zblock, res)
+function fetchIPFShash(ipfs_hash, res)
{
regex= /Qm[A-Za-z0-9]{44}/;
- if (regex.test(zblock)){
- const path = `${config.ipfsArtifactsDir}/${zblock}`;
+ if (regex.test(ipfs_hash)){
+ const path = `${config.ipfsArtifactsDir}/${ipfs_hash}`;
console.log(path)
try
{
if(fs.existsSync(path))
{
- res.writeHead(200, {'Content-Type': 'application/json'});
- res.end(JSON.stringify(JSON.parse(fs.readFileSync(path))));
+ res.writeHead(200); //, {'Content-Type': 'application/json'});
+ // res.end(JSON.stringify(JSON.parse(fs.readFileSync(path))));
+ res.end(fs.readFileSync(path));
}
else
{
@@ -41,9 +44,10 @@ function fetchIPFShash(zblock, res)
}
};
-module.exports = (req, res) => {
+function getIPFSHash(req, res)
+{
var args = req.url.split("/");
- if ( (args[2] === 'ipfs_hash') && args[3] && typeof args[3] === "string" && args[3].length === 46 ){
+ if ( (args[2] === 'ipfs_hash'||args[2] === 'ipfs') && args[3] && typeof args[3] === "string" && args[3].length === 46 ){
regex= /Qm[A-Za-z0-9]{44}/;
if (regex.test(args[3]))
{
@@ -66,6 +70,7 @@ module.exports = (req, res) => {
else
{
res.writeHead(404, {'Content-Type': 'application/json'});
- res.end(JSON.stringify({error:"Invalid data: no valid zblock was provided"}));
+ res.end(JSON.stringify({error:"Invalid data: no valid ipfs_hash was provided"}));
}
}
+module.exports = getIPFSHash;
diff --git a/api/routes/getInnerIPFSContent/index.js b/api/routes/getInnerIPFSContent/index.js
index 721e836..a45b507 100644
--- a/api/routes/getInnerIPFSContent/index.js
+++ b/api/routes/getInnerIPFSContent/index.js
@@ -15,7 +15,8 @@ function fetchZblock(zblock, res){
res.end(JSON.stringify(JSON.parse(fs.readFileSync(path))));
};
-module.exports = (req, res) => {
+function getInnerIPFSContent(req, res)
+{
console.log(req.query)
if ( (req.query.ipfs) && typeof req.query.ipfs === "string" && req.query.ipfs.length === 46 ){
let ipfs = req.query.ipfs;
@@ -36,3 +37,4 @@ module.exports = (req, res) => {
res.end(JSON.stringify({error:"Invalid data: no valid zblock was provided"}));
}
}
+module.exports = getInnerIPFSContent;
diff --git a/api/routes/getLeaf/index.js b/api/routes/getLeaf/index.js
index 8855712..5afbe70 100644
--- a/api/routes/getLeaf/index.js
+++ b/api/routes/getLeaf/index.js
@@ -7,7 +7,8 @@
const fs = require('fs');
const config = require("../../config.js");
-module.exports = (req, res) => {
+function getLeaf(req, res)
+{
var args = req.url.split("/");
var hash = args[3];
regex= /[a-f0-9]{128}/
@@ -40,3 +41,4 @@ module.exports = (req, res) => {
}
}
+module.exports = getLeaf;
diff --git a/api/routes/getMap/index.js b/api/routes/getMap/index.js
index 791afb5..23b4e58 100644
--- a/api/routes/getMap/index.js
+++ b/api/routes/getMap/index.js
@@ -7,7 +7,8 @@
const fs = require('fs');
const config = require("../../config.js");
-module.exports = (req, res) => {
+function getMap(req, res)
+{
var args = req.url.split("/");
var hash = args[3];
regex= /[a-f0-9]{128}/
@@ -39,4 +40,4 @@ module.exports = (req, res) => {
res.end(JSON.stringify({error:"No hash"}));
}
}
-
+module.exports = getMap;
diff --git a/api/routes/getNodeInfo/index.js b/api/routes/getNodeInfo/index.js
index 27006ae..b267749 100644
--- a/api/routes/getNodeInfo/index.js
+++ b/api/routes/getNodeInfo/index.js
@@ -1,6 +1,7 @@
const { spawn } = require('child_process');
-module.exports = (req, res) => {
+function getNodeInfo(req, res)
+{
const command = spawn("ak-config", ["--get-published"]);
var buffer = "";
command.stdout.on("data", data => {
@@ -22,3 +23,4 @@ module.exports = (req, res) => {
console.log(`child process exited with code ${code}`);
});
};
+module.exports = getNodeInfo;
diff --git a/api/routes/getPeers/index.js b/api/routes/getPeers/index.js
index b18a015..47c075d 100644
--- a/api/routes/getPeers/index.js
+++ b/api/routes/getPeers/index.js
@@ -1,7 +1,8 @@
const config = require('../../config');
const fs = require('fs');
-module.exports = (req, res) => {
+function getPeers(req, res)
+{
const path = config.peersFile;
if(fs.existsSync(path)){
res.writeHead(200, {'Content-Type': 'application/json'});
@@ -11,3 +12,4 @@ module.exports = (req, res) => {
res.end({"error":"No peers :("})
}
};
+module.exports = getPeers;
diff --git a/api/routes/getRemoteNodeInfo/index.js b/api/routes/getRemoteNodeInfo/index.js
index a88f528..4b766c0 100644
--- a/api/routes/getRemoteNodeInfo/index.js
+++ b/api/routes/getRemoteNodeInfo/index.js
@@ -8,7 +8,8 @@ const { spawn } = require('child_process');
const config = require("../../config.js");
const checkIfAllowedIP = require('../../lib/checkIfAllowedIP/index.js');
-module.exports = (req, res) => {
+function getRemoteNodeInfo(req, res)
+{
var args = req.url.split("/");
var ip = "";
if ( args.length === 4 )
@@ -23,15 +24,12 @@ module.exports = (req, res) => {
command.stdout.on("data", data => {
buffer = buffer + data;
});
-
command.stderr.on("data", data => {
console.log(`stderr: ${data}`);
});
-
command.on('error', (error) => {
console.log(`error: ${error.message}`);
});
-
command.on("close", code => {
res.writeHead(200, { 'Content-Type': 'application/json'});
res.end(buffer);
@@ -44,4 +42,4 @@ module.exports = (req, res) => {
res.end(JSON.stringify({error:"No IP"}));
}
}
-
+module.exports = getRemoteNodeInfo;
diff --git a/api/routes/getRemotePeers/index.js b/api/routes/getRemotePeers/index.js
index c75a98a..dac0f04 100644
--- a/api/routes/getRemotePeers/index.js
+++ b/api/routes/getRemotePeers/index.js
@@ -8,7 +8,8 @@ const { spawn } = require('child_process');
const config = require("../../config.js");
const checkIfAllowedIP = require('../../lib/checkIfAllowedIP/index.js');
-module.exports = (req, res) => {
+function getRemotePeers(req, res)
+{
var args = req.url.split("/");
var ip = "";
if ( args.length === 4 )
@@ -22,15 +23,12 @@ module.exports = (req, res) => {
command.stdout.on("data", data => {
buffer = buffer + data;
});
-
command.stderr.on("data", data => {
console.log(`stderr: ${data}`);
});
-
command.on('error', (error) => {
console.log(`error: ${error.message}`);
});
-
command.on("close", code => {
if ( code === 0 )
{
@@ -52,3 +50,4 @@ module.exports = (req, res) => {
}
}
+module.exports = getRemotePeers;
diff --git a/api/routes/getSBlock/index.js b/api/routes/getSBlock/index.js
index 2fb8c80..85565b2 100644
--- a/api/routes/getSBlock/index.js
+++ b/api/routes/getSBlock/index.js
@@ -7,7 +7,8 @@ const { spawn } = require('child_process');
const fs = require('fs');
const config = require("../../config.js");
-module.exports = (req, res) => {
+function getSBlock(req, res)
+{
var args = req.url.split("/");
var sblock = args[3];
regex= /[a-f0-9]{128}/
@@ -20,16 +21,13 @@ module.exports = (req, res) => {
command.stdout.on("data", data => {
response_string += data;
});
-
command.stderr.on("data", data => {
console.log(`stderr: ${data}`);
});
-
command.on('error', (error) => {
console.log(`error: ${error.message}`);
response_string={err:"error.message"};
});
-
command.on("close", code => {
if ( code === 0 ) {
res.writeHead(200, {'Content-Type': 'application/json'});
@@ -49,4 +47,4 @@ module.exports = (req, res) => {
res.end(JSON.stringify({error:"No hash"}));
}
}
-
+module.exports = getSBlock;
diff --git a/api/routes/getZChain/index.js b/api/routes/getZChain/index.js
index 6df2d7f..934b436 100644
--- a/api/routes/getZChain/index.js
+++ b/api/routes/getZChain/index.js
@@ -7,7 +7,8 @@ const { spawn } = require('child_process');
* - A JSON array representing the nodes' arching-kaos-zchain
*
*/
-module.exports = (req, res) => {
+function getZChain(req, res)
+{
const command = spawn("ak", ["zchain", "--crawl"]);
response_string = "";
command.stdout.on("data", data => {
@@ -27,3 +28,5 @@ module.exports = (req, res) => {
console.log(`child process exited with code ${code}`);
});
};
+
+module.exports = getZChain;
diff --git a/api/routes/showEntriesFile/index.js b/api/routes/showEntriesFile/index.js
index 3dd1c40..1246460 100644
--- a/api/routes/showEntriesFile/index.js
+++ b/api/routes/showEntriesFile/index.js
@@ -8,7 +8,9 @@ const config = require('../../config');
* - the file, it's already in JSON format.
*
*/
-module.exports = (req, res) => {
+function showEntriesFile(req, res)
+{
var data = JSON.parse(fs.readFileSync(config.blocksFile));
res.send(data);
-}; \ No newline at end of file
+};
+module.exports = showEntriesFile;
diff --git a/api/routes/showNSEntriesFile/index.js b/api/routes/showNSEntriesFile/index.js
index 745ddee..cc5edf6 100644
--- a/api/routes/showNSEntriesFile/index.js
+++ b/api/routes/showNSEntriesFile/index.js
@@ -9,7 +9,9 @@ const config = require('../../config');
* - the file, it's already in JSON format.
*
*/
-module.exports = (req, res) => {
+function showNSEntriesFile(req, res)
+{
var data = JSON.parse(fs.readFileSync(config.pairsFile));
res.send(data);
-}; \ No newline at end of file
+};
+module.exports = showNSEntriesFile;
diff --git a/api/validators/ZblockValidator/index.js b/api/validators/ZblockValidator/index.js
index e3656d6..e1cfd3f 100644
--- a/api/validators/ZblockValidator/index.js
+++ b/api/validators/ZblockValidator/index.js
@@ -64,7 +64,8 @@ function continuethings(exitcode,sh,res){
* We send the data tested and the exit code to continuethings()
*
*/
-module.exports = (ch, res) => {
+function ZblockValidator(ch, res)
+{
const command = spawn("ak",["zchain", "--crawl", ch]);
response_string = "";
command.stdout.on("data", data => {
@@ -85,3 +86,4 @@ module.exports = (ch, res) => {
continuethings(code,ch,res);
});
};
+module.exports = ZblockValidator;
diff --git a/api/validators/ZchainValidator/index.js b/api/validators/ZchainValidator/index.js
index 80939d0..a788719 100644
--- a/api/validators/ZchainValidator/index.js
+++ b/api/validators/ZchainValidator/index.js
@@ -64,7 +64,8 @@ function continuethings(exitcode,sh,res){
* We send the data tested and the exit code to continuethings()
*
*/
-module.exports = (ch, res) => {
+function ZchainValidator(ch, res)
+{
const command = spawn("ak",["zchain", "--crawl", "-n", ch]);
response_string = "";
command.stdout.on("data", data => {
@@ -85,3 +86,5 @@ module.exports = (ch, res) => {
continuethings(code,ch,res);
});
};
+
+module.exports = ZchainValidator;
diff --git a/lib/_ak_ns b/lib/_ak_ns
index c391d51..683f572 100755
--- a/lib/_ak_ns
+++ b/lib/_ak_ns
@@ -59,6 +59,23 @@ function _ak_ns_list_long(){
_ak_gpg_list_secret_keys_long | grep '@keynames.kaos.kaos'
}
+function _ak_ns_resolve_from_key(){
+ # $1; exit;;
+ if [ -z $1 ] || [ ! -n "$1" ]
+ then
+ _ak_log_error "No key was given"
+ exit 1
+ fi
+ key="$1"
+ _ak_log_info "${key} was given"
+ if [ ! -f ${AK_NS_DIR}/${key} ]
+ then
+ _ak_log_error "${key} was not found"
+ exit 1
+ fi
+ _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key}
+}
+
function _ak_ns_resolve_from_name(){
# $1; exit;;
if [ -z $1 ] || [ ! -n "$1" ]
@@ -79,29 +96,11 @@ function _ak_ns_resolve_from_name(){
fi
_ak_ns_resolve_from_key ${key}
fi
- _ak_not_implemented "${FUNCNAME}"
-}
-
-function _ak_ns_resolve_from_key(){
- # $1; exit;;
- if [ -z $1 ] || [ ! -n "$1" ]
- then
- _ak_log_error "No key was given"
- exit 1
- fi
- key="$1"
- _ak_log_info "${key} was given"
- if [ ! -f ${AK_NS_DIR}/${key} ]
- then
- _ak_log_error "${key} was not found"
- exit 1
- fi
- _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key}
- _ak_not_implemented "${FUNCNAME}"
}
function _ak_ns_publish(){
# $1 $2; exit;;
+ _ak_not_implemented "${FUNCNAME}"
if [ -z $1 ] || [ ! -n "$1" ]
then
_ak_log_error "No key was given"
@@ -134,11 +133,11 @@ function _ak_ns_publish(){
then
_ak_gpg_sign_clear_with_key $key
fi
- _ak_not_implemented "${FUNCNAME}"
}
function _ak_ns_publish2name(){
# $1 $2; exit;;
+ _ak_not_implemented "${FUNCNAME}"
if [ -z $1 ] || [ ! -n "$1" ]
then
_ak_log_error "No key name was given"
@@ -156,7 +155,6 @@ function _ak_ns_publish2name(){
exit 1
fi
_ak_ns_publish ${key} $2
- _ak_not_implemented "${FUNCNAME}"
}
function _ak_ns_publish_zchain(){
@@ -169,19 +167,15 @@ function _ak_ns_publish_zchain(){
_ak_ns_create zchain
fi
zchain_key="$(_ak_gpg_list_secret_keys_long | grep 'zchain@keynames.kaos.kaos' | cut -d ' ' -f 1)"
- # We need to prepare the file now to be signed
- # Put the zlatest into a file
zlatest_file="$(_ak_make_temp_file)"
echo -n ${zlatest} > ${zlatest_file}
zlatest_csigned_file="$(_ak_make_temp_file)"
_ak_gpg_sign_clear_with_key ${zlatest_csigned_file} ${zlatest_file} ${zchain_key}
- # What to do now with the clear signed file?
if [ -f ${AK_NS_DIR}/${zchain_key} ]
then
_ak_gpg_verify_clear_signature ${AK_NS_DIR}/${zchain_key} >> ${AK_NS_DIR}/${zchain_key}.history
fi
mv ${zlatest_csigned_file} ${AK_NS_DIR}/${zchain_key}
- # _ak_not_implemented "${FUNCNAME}"
}
function _ak_ns_publish_config(){
@@ -194,19 +188,15 @@ function _ak_ns_publish_config(){
_ak_ns_create zconfig
fi
zconfig_key="$(_ak_gpg_list_secret_keys_long | grep 'zconfig@keynames.kaos.kaos' | cut -d ' ' -f 1)"
- # We need to prepare the file now to be signed
- # Put the zlatest into a file
zconfig_file="$(_ak_make_temp_file)"
echo -n ${zconfig} > ${zconfig_file}
zconfig_csigned_file="$(_ak_make_temp_file)"
_ak_gpg_sign_clear_with_key ${zconfig_csigned_file} ${zconfig_file} ${zconfig_key}
- # What to do now with the clear signed file?
if [ -f ${AK_NS_DIR}/${zconfig_key} ]
then
_ak_gpg_verify_clear_signature ${AK_NS_DIR}/${zconfig_key} >> ${AK_NS_DIR}/${zconfig_key}.history
fi
mv ${zconfig_csigned_file} ${AK_NS_DIR}/${zconfig_key}
- # _ak_not_implemented "${FUNCNAME}"
}
_ak_log_debug "_ak_ns loaded $(caller)"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-14 19:09:24 +0000