diff options
Diffstat (limited to 'api')
25 files changed, 135 insertions, 61 deletions
diff --git a/api/config.js b/api/config.js index fc944e1..3fe7c0d 100644 --- a/api/config.js +++ b/api/config.js @@ -18,6 +18,7 @@ const config = { blocksFile : env.AK_ZBLOCKSFILE, pairsFile : env.AK_ZPAIRSFILE, peersFile : env.AK_ZPEERSFILE, + peersDir : env.AK_ZPEERSDIR, cacheDir : env.AK_CACHEDIR, ipfsArtifactsDir: `${env.AK_WORKDIR}/ipfs_artifacts`, minedBlocksDir: env.AK_MINEDBLOCKSDIR, diff --git a/api/index.js b/api/index.js index f61b339..f2ca713 100755 --- a/api/index.js +++ b/api/index.js @@ -14,12 +14,17 @@ const getRemoteNodeInfo = require('./routes/getRemoteNodeInfo/index.js'); const getRemotePeers = require('./routes/getRemotePeers/index.js'); const akLogMessage = require('./lib/akLogMessage'); +const checkIfAllowedIP = require('./lib/checkIfAllowedIP/index.js'); +const storeIncomingIP = require("./lib/storeIncomingIP/index.js"); +akLogMessage('INFO', 'akLogMessage loaded'); const serverOptions = { keepAliveTimeout: 60000 }; function printRequest(req) { + storeIncomingIP(req.connection.remoteAddress); console.log(req.connection.remoteAddress); + console.log(req.headers.host); console.log(req.headers); console.log(req.method, req.url); console.log('HTTP/' + req.httpVersion); @@ -54,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; @@ -97,14 +103,6 @@ function processMethod(req, res) } } -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; -} - function requestParser(req, res) { printRequest(req); diff --git a/api/lib/akLogMessage/index.js b/api/lib/akLogMessage/index.js index 0df974a..59a1300 100644 --- a/api/lib/akLogMessage/index.js +++ b/api/lib/akLogMessage/index.js @@ -1,10 +1,11 @@ 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] + "ak-log", + ["-m", "ak-daemon", type, message] ); var buffer = ""; @@ -20,9 +21,10 @@ module.exports = (type, message) => { console.log(`error: ${error.message}`); }); - command.on("close", code => { - // res.send(JSON.parse(buffer)); + command.on("close", (code) => { + console.log(buffer); if (config.printDebug === "yes") console.log(buffer); 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 new file mode 100644 index 0000000..2e50418 --- /dev/null +++ b/api/lib/checkIfAllowedIP/index.js @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..72273d0 --- /dev/null +++ b/api/lib/storeIncomingIP/index.js @@ -0,0 +1,8 @@ +const fs = require("node:fs"); +const config = require("../../config"); + +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 c9f6bd3..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!", @@ -10,6 +11,17 @@ module.exports = (req, res) => { routes:{ GET:[ {welcome:settings.DEF_PROTO+req.headers.host+"/"}, + {peers:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/peers"}, + {node_info:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/node_info"}, + {ipfs_hash:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/ipfs_hash/<hash>"}, + {zlatest:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/zlatest"}, + {sblock:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/sblock/<hash>"}, + {slatest:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/slatest"}, + {chunk:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/chunk/<hash>"}, + {leaf:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/leaf/<hash>"}, + {map:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/map/<hash>"}, + ], + oldGET:[ {gathered_zblocks:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/see"}, {node_local_chain:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/chain"}, {node_local_peers:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/peers"}, @@ -19,10 +31,10 @@ module.exports = (req, res) => { {show_mined_block:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/sblock"}, {getMerkleTree:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/mrk/:mkr"}, ], - POST:[ + oldPOST:[ {send_me_a_zblock:settings.DEF_PROTO+req.headers.host+settings.URL_PREFIX+"/announce/zblock"}, ] } })); } - +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 d99382a..b267749 100644 --- a/api/routes/getNodeInfo/index.js +++ b/api/routes/getNodeInfo/index.js @@ -1,11 +1,11 @@ const { spawn } = require('child_process'); -const akLogMessage = require('../../lib/akLogMessage'); -module.exports = (req, res) => { - akLogMessage('INFO', `Incoming from [${req.connection.remoteAddress}]:${req.socket._peername.port} @ ${req.url}`); +function getNodeInfo(req, res) +{ const command = spawn("ak-config", ["--get-published"]); var buffer = ""; command.stdout.on("data", data => { + console.log(`stdout: ${data}`); buffer = buffer + data; }); @@ -23,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 6cfff4b..4b766c0 100644 --- a/api/routes/getRemoteNodeInfo/index.js +++ b/api/routes/getRemoteNodeInfo/index.js @@ -6,8 +6,10 @@ 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 ) @@ -15,22 +17,19 @@ module.exports = (req, res) => { ip = args[3]; } var test = /^fc[0-9a-z]{1,2}:([0-9a-z]{1,4}:){1,6}[0-9a-z]{1,4}/ - if (test.test(ip)) + if (checkIfAllowedIP(ip)) { const command = spawn("curl", ["--retry-max-time","3","-s",`http://[${ip}]:8610/v0/node_info`]); var buffer = ""; 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); @@ -43,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 78dbba4..dac0f04 100644 --- a/api/routes/getRemotePeers/index.js +++ b/api/routes/getRemotePeers/index.js @@ -6,31 +6,29 @@ 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 ) { ip = args[3]; } - var test = /^fc[0-9a-z]{1,2}:([0-9a-z]{1,4}:){1,6}[0-9a-z]{1,4}/ - if (test.test(ip)) + if (checkIfAllowedIP(ip)) { const command = spawn("curl", ["--retry-max-time","3","-s",`http://[${ip}]:8610/v0/peers`]); var buffer = ""; 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/tests/get_peers.sh b/api/tests/get_peers.sh new file mode 100755 index 0000000..14d7a54 --- /dev/null +++ b/api/tests/get_peers.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +curl -s -o soe "http://[`cjdns-online`]:8610/v0/peers" | jq diff --git a/api/tests/node_local_info.sh b/api/tests/node_local_info.sh new file mode 100755 index 0000000..0d45438 --- /dev/null +++ b/api/tests/node_local_info.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +PROGRAM="$(basename $0)" +source $AK_LIBDIR/_ak_ipfs +printf '[%s]\n' "$PROGRAM" +API_RES="$(curl -s http://127.0.0.1:8610/v0/node_info 2>/dev/null | sha512sum - | awk '{ printf $1 }')" +CMD_RES="$(_ak_ipfs_cat $(ak-node-info --ipfs) | sha512sum - | awk '{ printf $1 }')" +printf "TEST /node_info\n" +printf "\t01:\tLatest is the same between API response and CLI..." +if [ "$API_RES" == "$CMD_RES" ] +then + printf "\t\t\033[0;32mPASSED\033[0;0m" +else + printf "\t\t\033[0;31mFAILED\033[0;0m" +fi +printf "\n" 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; |