From 5dde85410ef27aa0699c6158057b43d70498c1db Mon Sep 17 00:00:00 2001 From: zeus Date: Sun, 10 Jan 2021 22:10:13 +0200 Subject: [PATCH] add hybrid ssh --- README.md | 3 + hybrid/create-keys.sh | 9 + hybrid/keys.json | 4 + hybrid/privatekey | 2 +- hybrid/publickey | 2 +- src-local/hybrid/connect/join-backup.sh | 44 ++ src-local/hybrid/connect/join.sh | 43 ++ src-local/hybrid/connect/leave-backup.sh | 23 + src-local/hybrid/connect/leave.sh | 23 + src-local/hybrid/connect/privatekey | 1 + src-local/hybrid/connect/publickey | 1 + src-local/hybrid/connect/status-wg.sh | 16 + src-local/hybrid/connect/status.sh | 37 + src-local/hybrid/connect/swarmlab-connect.sh | 33 + src-local/hybrid/connect/template-connect.sh | 38 + src-local/hybrid/connect/template-swarm.sh | 2 + src-local/hybrid/connect/template-wg0.conf | 10 + src-local/hybrid/connect/wg-test.sh | 11 + src-local/hybrid/connect/wg0.conf | 10 + src-local/hybrid/create-keys.sh | 9 + src-local/hybrid/join.sh | 2 + src-local/hybrid/keys.json | 1 + src-local/hybrid/privatekey | 1 + src-local/hybrid/publickey | 1 + src-local/hybrid/scripts/add-nic-veth-pair.sh | 29 + src-local/hybrid/scripts/add-nic.sh | 26 + src-local/hybrid/scripts/expose-netns.sh | 24 + src-local/llo/bclient.js | 48 -- src-local/llo/client.js | 32 - src-local/llo/iotclient.js | 40 -- src-local/llo/iotserver.js | 381 ---------- src-local/llo/new.js | 285 ++++++++ src-local/llo/pubsub.js | 29 - src-local/llo/test.js | 32 - src-local/llo/test1.js | 38 - src/App.vue | 45 +- src/components/manageservices.vue | 55 ++ .../manageservices/manage-service.vue | 670 ++++++++++++++++++ src/components/myconnect-server.vue | 55 ++ src/components/mynetwork/myconnect-server.vue | 396 +++++++++++ src/components/mynetwork/mytable.vue | 69 ++ src/store/modules/create_pipelineLLO.js | 141 +++- viwsession/session1 | 181 ++++- 43 files changed, 2259 insertions(+), 643 deletions(-) create mode 100644 hybrid/create-keys.sh create mode 100644 hybrid/keys.json create mode 100644 src-local/hybrid/connect/join-backup.sh create mode 100644 src-local/hybrid/connect/join.sh create mode 100644 src-local/hybrid/connect/leave-backup.sh create mode 100644 src-local/hybrid/connect/leave.sh create mode 100644 src-local/hybrid/connect/privatekey create mode 100644 src-local/hybrid/connect/publickey create mode 100644 src-local/hybrid/connect/status-wg.sh create mode 100644 src-local/hybrid/connect/status.sh create mode 100755 src-local/hybrid/connect/swarmlab-connect.sh create mode 100755 src-local/hybrid/connect/template-connect.sh create mode 100644 src-local/hybrid/connect/template-swarm.sh create mode 100644 src-local/hybrid/connect/template-wg0.conf create mode 100755 src-local/hybrid/connect/wg-test.sh create mode 100755 src-local/hybrid/connect/wg0.conf create mode 100644 src-local/hybrid/create-keys.sh create mode 100644 src-local/hybrid/join.sh create mode 100644 src-local/hybrid/keys.json create mode 100644 src-local/hybrid/privatekey create mode 100644 src-local/hybrid/publickey create mode 100755 src-local/hybrid/scripts/add-nic-veth-pair.sh create mode 100755 src-local/hybrid/scripts/add-nic.sh create mode 100755 src-local/hybrid/scripts/expose-netns.sh delete mode 100644 src-local/llo/bclient.js delete mode 100644 src-local/llo/client.js delete mode 100644 src-local/llo/iotclient.js delete mode 100644 src-local/llo/iotserver.js delete mode 100644 src-local/llo/pubsub.js delete mode 100644 src-local/llo/test.js delete mode 100644 src-local/llo/test1.js create mode 100644 src/components/manageservices.vue create mode 100644 src/components/manageservices/manage-service.vue create mode 100644 src/components/myconnect-server.vue create mode 100644 src/components/mynetwork/myconnect-server.vue diff --git a/README.md b/README.md index 4ccc5d0..9c81e47 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # swarmlab-hybrid +jq +sudo apt install wireguard + diff --git a/hybrid/create-keys.sh b/hybrid/create-keys.sh new file mode 100644 index 0000000..58d064b --- /dev/null +++ b/hybrid/create-keys.sh @@ -0,0 +1,9 @@ + + +wg genkey | tee ./privatekey | wg pubkey > ./publickey + +privatekey=$(head -1 ./privatekey) +publickey=$(head -1 ./publickey) + +jq --arg key0 'private' --arg private $privatekey --arg key1 'public' --arg public $publickey '. | .[$key0]=$private | .[$key1]=$public ' <<<'{}' > ./keys.json + diff --git a/hybrid/keys.json b/hybrid/keys.json new file mode 100644 index 0000000..9005300 --- /dev/null +++ b/hybrid/keys.json @@ -0,0 +1,4 @@ +{ + "private": "EDcHFoG5cE/110wPaYgVjNdtHkULRMDE9vECia/4I3g=", + "public": "hQ4VKJePvguRkcGOOaT7fcKNE2HyYGqBoacByNNd7Xo=" +} diff --git a/hybrid/privatekey b/hybrid/privatekey index 26e9072..6893d46 100644 --- a/hybrid/privatekey +++ b/hybrid/privatekey @@ -1 +1 @@ -6CdrILpdZcm1OfOecSQSgaI90sLNOTVW9zO9Dac5b0w= +kCoimlkUSkb4MaEVoI4ePThzKDYNZF9A/4d0L1u3q38= diff --git a/hybrid/publickey b/hybrid/publickey index 123774d..c8e1c21 100644 --- a/hybrid/publickey +++ b/hybrid/publickey @@ -1 +1 @@ -fEirlFuleXLeY2pgsCVb8G16DEVXJVGJuXdifX1+/wY= +R97cS/PXC5N1dxom0pODyNhqnXfyIUqg04Fu1OU0fGs= diff --git a/src-local/hybrid/connect/join-backup.sh b/src-local/hybrid/connect/join-backup.sh new file mode 100644 index 0000000..de2ac6a --- /dev/null +++ b/src-local/hybrid/connect/join-backup.sh @@ -0,0 +1,44 @@ + +function swarmlab_ifup() { +swarmlab=$(/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/status.sh wg0 | jq .swarmlab) +tempswarm="${swarmlab%\"}" +tempswarm="${tempswarm#\"}" +swarmlab=$tempswarm +echo $swarmlab +} +function hybrid_ifup() { +hybrid=$(/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/status.sh wg0 | jq .hybrid) +tempswarm1="${hybrid%\"}" +tempswarm1="${tempswarm1#\"}" +hybrid=$tempswarm1 +echo $hybrid +} + +hybrid=$(hybrid_ifup) +if [ $hybrid == 'NotOnline' ]; then + /bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/swarmlab-connect.sh + sleep 2 + hybrid1=$(hybrid_ifup) + if [ $hybrid1 == 'NotOnline' ]; then + echo "Failed to start wg0 network interface" + else + echo "Swarmlab hybrid $hybrid" + fi +else + echo "Swarmlab hybrid $hybrid" +fi + +swarmlab=$(swarmlab_ifup) +if [ $swarmlab != 'active' ]; then + sleep 1 + swarmlab1=$(swarmlab_ifup) + if [ $swarmlab1 != 'active' ]; then + echo "Failed to connect on swarmlab master" + echo "Exec " + echo "/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/reload-swarmlab.sh" + echo "Please try again" + fi +else + echo "Swarmlab master $swarmlab" +fi + diff --git a/src-local/hybrid/connect/join.sh b/src-local/hybrid/connect/join.sh new file mode 100644 index 0000000..3e15117 --- /dev/null +++ b/src-local/hybrid/connect/join.sh @@ -0,0 +1,43 @@ + +function swarmlab_ifup() { + swarmlab=$(/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/status.sh wg0 | jq .swarmlab) + tempswarm="${swarmlab%\"}" + tempswarm="${tempswarm#\"}" + swarmlab=$tempswarm + echo $swarmlab +} +function hybrid_ifup() { + hybrid=$(/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/status.sh wg0 | jq .hybrid) + tempswarm1="${hybrid%\"}" + tempswarm1="${tempswarm1#\"}" + hybrid=$tempswarm1 + echo $hybrid +} + +hybrid=$(hybrid_ifup) +if [ $hybrid == 'NotOnline' ]; then + /bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/swarmlab-connect.sh + sleep 2 + hybrid1=$(hybrid_ifup) + if [ $hybrid1 == 'NotOnline' ]; then + echo "Failed to start wg0 network interface" + else + echo "Swarmlab hybrid $hybrid" + fi +else + echo "Swarmlab hybrid $hybrid" +fi + +swarmlab=$(swarmlab_ifup) +if [ $swarmlab != 'active' ]; then + sleep 1 + swarmlab1=$(swarmlab_ifup) + if [ $swarmlab1 != 'active' ]; then + echo "Failed to connect on swarmlab master" + echo "Exec " + echo "/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/reload-swarmlab.sh" + echo "Please try again" + fi +else + echo "Swarmlab master $swarmlab" +fi diff --git a/src-local/hybrid/connect/leave-backup.sh b/src-local/hybrid/connect/leave-backup.sh new file mode 100644 index 0000000..950c247 --- /dev/null +++ b/src-local/hybrid/connect/leave-backup.sh @@ -0,0 +1,23 @@ +function hybrid_ifup() { + hybrid=$(/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/status.sh wg0 | jq .hybrid) + tempswarm1="${hybrid%\"}" + tempswarm1="${tempswarm1#\"}" + hybrid=$tempswarm1 + echo $hybrid +} + +hybrid=$(hybrid_ifup) +if [ $hybrid == 'NotOnline' ]; then + echo "Swarmlab hybrid $hybrid" +else + ip link set wg0 down + ip link del wg0 + sleep 3 + hybrid1=$(hybrid_ifup) + if [ $hybrid1 == 'NotOnline' ]; then + echo "Swarmlab hybrid $hybrid" + else + echo "Swarmlab hybrid $hybrid" + fi +fi + diff --git a/src-local/hybrid/connect/leave.sh b/src-local/hybrid/connect/leave.sh new file mode 100644 index 0000000..6a195d2 --- /dev/null +++ b/src-local/hybrid/connect/leave.sh @@ -0,0 +1,23 @@ + +function hybrid_ifup() { + hybrid=$(/bin/bash /data/appl/ok/swarmlab-hybrid-agent/src-local/hybrid/connect/status.sh wg0 | jq .hybrid) + tempswarm1="${hybrid%\"}" + tempswarm1="${tempswarm1#\"}" + hybrid=$tempswarm1 + echo $hybrid +} + +hybrid=$(hybrid_ifup) +if [ $hybrid == 'NotOnline' ]; then + echo "Swarmlab hybrid $hybrid" +else + ip link set wg0 down + ip link del wg0 + sleep 3 + hybrid1=$(hybrid_ifup) + if [ $hybrid1 == 'NotOnline' ]; then + echo "Swarmlab hybrid $hybrid" + else + echo "Swarmlab hybrid $hybrid" + fi +fi diff --git a/src-local/hybrid/connect/privatekey b/src-local/hybrid/connect/privatekey new file mode 100644 index 0000000..ec0e2aa --- /dev/null +++ b/src-local/hybrid/connect/privatekey @@ -0,0 +1 @@ +uHuqIEOoQTsESNhiz7Uu1COJlbIHdruBiMUG1GvBTHM= diff --git a/src-local/hybrid/connect/publickey b/src-local/hybrid/connect/publickey new file mode 100644 index 0000000..c5fdd3d --- /dev/null +++ b/src-local/hybrid/connect/publickey @@ -0,0 +1 @@ +ol5eKuHsOOAY9mWpVnsVTG+EODv8Hcl8bMobkNx4Si8= diff --git a/src-local/hybrid/connect/status-wg.sh b/src-local/hybrid/connect/status-wg.sh new file mode 100644 index 0000000..0eda720 --- /dev/null +++ b/src-local/hybrid/connect/status-wg.sh @@ -0,0 +1,16 @@ + +function ifup { + if [[ ! -d /sys/class/net/${1} ]]; then + #printf 'No such interface: %s\n' "$1" >&2 + return 1 + else + [[ $( ./publickey + +privatekey=$(head -1 ./privatekey) +publickey=$(head -1 ./publickey) + +jq --arg key0 'private' --arg private $privatekey --arg key1 'public' --arg public $publickey '. | .[$key0]=$private | .[$key1]=$public ' <<<'{}' | tee ./keys.json + diff --git a/src-local/hybrid/join.sh b/src-local/hybrid/join.sh new file mode 100644 index 0000000..34774da --- /dev/null +++ b/src-local/hybrid/join.sh @@ -0,0 +1,2 @@ + docker swarm join --token SWMTKN-1-3099nls9my5ns1s0mnmwkx41mhpawl80hwjjbskbll7nghqhgn-asu68y4lhd1qlbpxr6oosk6wl 10.13.13.1:2377 + diff --git a/src-local/hybrid/keys.json b/src-local/hybrid/keys.json new file mode 100644 index 0000000..1453378 --- /dev/null +++ b/src-local/hybrid/keys.json @@ -0,0 +1 @@ +"{\"status\":\"off\",\"privatekey\":\"kJd3ga9/1b5NalONMP+CuezTZB+ZmaQVdzM7jLYUe30=\",\"publickey\":\"jf4fC0tmGe4Ioz+dY5c/AksqicZGGqJIH1OncOUIuj8=\",\"server_ip\":\"83.212.77.133:51820\",\"workerkey\":\"SWMTKN-1-3099nls9my5ns1s0mnmwkx41mhpawl80hwjjbskbll7nghqhgn-asu68y4lhd1qlbpxr6oosk6wl\",\"allowed_ips\":\"10.13.13.0/16, 0.0.0.0/0, ::/0\",\"swarmlab_public_wgkey\":\"WAuzcpIf1obckeLP94owls31j58LP2k+yIAasx9VFU8=\",\"wg_ip\":\"10.13.13.2\",\"swarm_ip\":\"10.13.13.1:2377\",\"wg_port\":\"51820\"}" \ No newline at end of file diff --git a/src-local/hybrid/privatekey b/src-local/hybrid/privatekey new file mode 100644 index 0000000..3af6acf --- /dev/null +++ b/src-local/hybrid/privatekey @@ -0,0 +1 @@ +EEQqA/IEqbKRHuo8Har5JsjatOYY++JMmiU/QEr4zlw= diff --git a/src-local/hybrid/publickey b/src-local/hybrid/publickey new file mode 100644 index 0000000..c1641b6 --- /dev/null +++ b/src-local/hybrid/publickey @@ -0,0 +1 @@ +iAn+EwqtojVrIV58N5jpnjlHeqCYhGKS8gHpaHuieBA= diff --git a/src-local/hybrid/scripts/add-nic-veth-pair.sh b/src-local/hybrid/scripts/add-nic-veth-pair.sh new file mode 100755 index 0000000..85e842b --- /dev/null +++ b/src-local/hybrid/scripts/add-nic-veth-pair.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +if [ $# -lt 3 ]; then + echo "This script will create a veth pair, attach one end to an OVS bridge," + echo "and another end to the specified container as a virtual NIC." + echo "" + echo "Usage: $0 " + echo "Example: $0 test-container-1 veth-1 peer-1 br-int" + exit 1 +fi + +CONTAINER=$1 +VETH=$2 +PEER=$3 +OVS_BR=$4 +NETNS=`sudo docker inspect -f '{{.State.Pid}}' $CONTAINER` + +echo "add veth pair[$VETH <--> $PEER] to container[$CONTAINER] in netns[$NETNS]" +ip link delete $VETH || true +ip link add $VETH type veth peer name $PEER + +echo "add port to ovs bridge $OVS_BR" +ovs-vsctl add-port $OVS_BR $VETH + +echo "move $PEER to netns $NETNS" +ip link set $PEER netns $NETNS +ip netns exec $NETNS ip link set dev $PEER up + +echo "done" diff --git a/src-local/hybrid/scripts/add-nic.sh b/src-local/hybrid/scripts/add-nic.sh new file mode 100755 index 0000000..2ac458d --- /dev/null +++ b/src-local/hybrid/scripts/add-nic.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +if [ $# -lt 3 ]; then + echo "This script will add an OVS internal port to an OVS bridge," + echo "then assign the port to the specified container as a virtual NIC." + echo "" + echo "Usage: $0 " + echo "Example: $0 test-container-1 vnic-1 br-int" + exit 1 +fi + +CONTAINER=$1 +PORT=$2 +OVS_BR=$3 +NETNS=`sudo docker inspect -f '{{.State.Pid}}' $CONTAINER` +echo "add port[$PORT] to container[$CONTAINER] in netns[$NETNS]" + +echo "add port to ovs bridge $OVS_BR" +ovs-vsctl add-port $OVS_BR $PORT -- set Interface $PORT type=internal +#ovs-vsctl add-port br-int vnic-1 -- set Interface vnic-1 type=internal + +echo "move $PORT to netns $NETNS" +ip link set $PORT netns $NETNS +ip netns exec $NETNS ip link set dev $PORT up + +echo "done" diff --git a/src-local/hybrid/scripts/expose-netns.sh b/src-local/hybrid/scripts/expose-netns.sh new file mode 100755 index 0000000..bb45e80 --- /dev/null +++ b/src-local/hybrid/scripts/expose-netns.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Usage: $0 " + exit 1 +fi + +echo "expose container $1 netns" +NETNS=`sudo docker inspect -f '{{.State.Pid}}' $1` + +if [ ! -d /var/run/netns ]; then + mkdir /var/run/netns +fi +if [ -f /var/run/netns/$NETNS ]; then + rm -rf /var/run/netns/$NETNS +fi + +ln -s /proc/$NETNS/ns/net /var/run/netns/$NETNS +echo "done. netns: $NETNS" + +echo "=============================" +echo "current network namespaces: " +echo "=============================" +ip netns diff --git a/src-local/llo/bclient.js b/src-local/llo/bclient.js deleted file mode 100644 index e47201d..0000000 --- a/src-local/llo/bclient.js +++ /dev/null @@ -1,48 +0,0 @@ -var path = require('path'); -var app = require('express')(); -var http = require('http').Server(app); -var io = require('socket.io')(http); - -const socketAuth = require('socketio-auth'); - -socketoptions = { - secure:true, - reconnect: true, - rejectUnauthorized : false -}; - - -// Client -var io2 = require('socket.io-client'); -var socket = io2.connect('https://83.212.78.17:3088', socketoptions); - -socket.on('connection', s => { - console.error('socket2 connection'); - var id = s.id - - - var roomiot = 'iot' - socket.emit('iot', roomiot); - - socket.emit('subscribe', roomiot); - - socket.emit('pingServerEmit', roomiot); - - - s.on('message', function (data) { - console.log('from room1 '+data); - }); - s.on('iot', function (data) { - console.log('from room1 '+data); - }); -}); - - var roomiot = 'iot' - socket.emit('action', roomiot); - - socket.on('message', function (data) { - console.log('from room '+data); - }); - - - diff --git a/src-local/llo/client.js b/src-local/llo/client.js deleted file mode 100644 index fc24598..0000000 --- a/src-local/llo/client.js +++ /dev/null @@ -1,32 +0,0 @@ -options = { - secure:true, - reconnect: true, - rejectUnauthorized : false -}; - -// Client -var io2 = require('socket.io-client'); -var socket = io2.connect('http://localhost:8084', options); -//var socket = io2.connect('https://service.swarmlab.io:55583'); - -var msg2 = "hello"; -socket.emit('pingServer', msg2); - - - -//var socket = require('socket.io-client')('httpis://localhost:8099'); -socket.on('connect', function(){ - console.error('connect ...'); - //socket.emit("adhoc", 'Hallo World!') -}); -socket.on('customEmit', function(data){ - console.error('customEmit '+data); - //socket.emit("adhoc", 'Hallo World!') - -}); -socket.on('disconnect', function(){ - console.error('disconnect'); - -}); - //socket.emit("adhoc", 'Hallo World!') - diff --git a/src-local/llo/iotclient.js b/src-local/llo/iotclient.js deleted file mode 100644 index 1a24345..0000000 --- a/src-local/llo/iotclient.js +++ /dev/null @@ -1,40 +0,0 @@ - -var fs = require( 'fs' ); -var app = require('express')(); -var https = require('https'); -var server = https.createServer({ - key: fs.readFileSync('./llo/swarmlab.key'), - cert: fs.readFileSync('./llo/swarmlab.crt'), - //ca: fs.readFileSync('./test_ca.crt'), - requestCert: false, - rejectUnauthorized: false -},app); - - -server.listen(3000, () => console.error('listening on https://localhost:3000/')); -var io = require('socket.io').listen(server); -console.error('socket.io example'); - - - -io.on('connection', s => { - if( typeof s !== "undefined" ){ - console.error('socket connection'); - } - - s.on('actionstart', obj => { - console.error('fromclient '+obj); - socket.emit("log", obj) - }); -/* - s.on('s1', function(room) { - console.log('leaving room', room); - }) -*/ - s.on('s1', () => { - console.log('hi from server'); - }); // listen to the event - - -}); - diff --git a/src-local/llo/iotserver.js b/src-local/llo/iotserver.js deleted file mode 100644 index 284f46a..0000000 --- a/src-local/llo/iotserver.js +++ /dev/null @@ -1,381 +0,0 @@ -"use strict" - -var pathmodule = require('path'); -var app = require('express')(); -var http = require('http').Server(app); -var https = require('https'); -var CONFIG = require( pathmodule.resolve( __dirname, "runconfig.js" ) ); -const io = require("socket.io")(http, { -// pingTimeout: 30000, -// allowUpgrades: false, -// serveClient: false, -// pingInterval: 10000, -// //transports: [ 'websocket', 'polling' ], -// transports: [ 'polling', 'websocket' ], - cors: { - origin: "http://localhost:8080", - methods: ["GET", "POST"], - allowedHeaders: ["my-custom-header"], - credentials: true - }, - cookie: { - name: "test", - httpOnly: false, - path: "/custom" - } -}); - -const { DateTime } = require("luxon"); - - - var async = require("async"); -const { check, validationResult } = require('express-validator'); -const urlExistSync = require("url-exist-sync"); - -var express = require('express'); -app.use(express.json()); - -const axios = require('axios'); -axios.defaults.timeout = 30000 - - const helmet = require('helmet'); -app.use(helmet()); - -const cors = require('cors') -const whitelist = [ - 'http://localhost:8080', - 'http://localhost:3080', - 'http://localhost:3081', - 'http://localhost:3082' - ] -const corsOptions = { - credentials: true, - methods: ['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS'], - optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204 - allowedHeaders: [ - 'Content-Type', - 'Authorization', - 'X-Requested-With', - 'device-remember-token', - 'Access-Control-Allow-Origin', - 'Access-Control-Allow-Headers', - 'Origin', - 'Accept' - ], - origin: function(origin, callback) { - if (whitelist.indexOf(origin) !== -1) { - callback(null, true) - } else { - callback(null, true) - //callback(new Error('Not allowed by CORS')) - } - } -} -app.use(cors) - - - -// *************************************************** -// checktoken -// *************************************************** - -async function checkToken(token) { - const agent = new https.Agent({ - rejectUnauthorized: false, - }); - const instance = axios.create({ - baseURL: 'https://api.swarmlab.io', - withCredentials: true, - rejectUnauthorized: false, - crossdomain: true, - httpsAgent: agent, - headers: { - 'Accept': 'application/json', - 'Content-Type': 'multipart/form-data', - 'Authorization': 'Bearer '+token - } - }) - try { - var pipelines = { - "source":'ssologin' - } - var params = { - pipeline: pipelines - } - - var options = { - headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, - }; - - instance.defaults.timeout = 30000; - const res = await instance.post('/istokenvalidsso',params,options); - if(res.status == 200){ - //console.log("check " +JSON.stringify(res.data)) - return res.data - }else{ - console.log("noerror: " + res) - return res.status - - } - } - catch (err) { - console.error("error: "+err); - var error = new Object(); - error.action = '401' - return error - } -} - - -function convertDateToUTC(date) { -return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(),date.getUTCMilliseconds()); -} - -// *************************************************** -// get pipelines -// *************************************************** - -async function getpipelines(token,pipelinename) { - const agent = new https.Agent({ - rejectUnauthorized: false, - }); - const instance = axios.create({ - baseURL: 'https://api.swarmlab.io', - withCredentials: true, - rejectUnauthorized: false, - crossdomain: true, - httpsAgent: agent, - headers: { - 'Accept': 'application/json', - 'Content-Type': 'multipart/form-data', - 'Authorization': 'Bearer '+token - } - }) - /* - var params = { - playbook: value - } - var options = { - params: params, - headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, - }; - - const playbook = await api.GET('playbookCode',options); - return playbook -*/ - try { - - var pipelines = { - "querytokenFilter":CONFIG.api.token, - "filter":pipelinename - } - //var params = { - // pipeline: pipelines - // } - var params = { - querytokenFilter:CONFIG.api.token, - filter:pipelinename - } - - var options = { - params: params, - headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, - }; - - //https://api.swarmlab.io/gettutorlabrooms?sort=pipelinename%7Casc&page=1&per_page=5&filter=&type=scripts&tutor=yes - instance.defaults.timeout = 30000; - //const res = await instance.get('/getplaygrounds',params,options); - const res = await instance.get('/getplaygrounds',options); - if(res.status == 200){ - return res.data - }else{ - console.log("noerror: " + res) - return await res.status - - } - } - catch (err) { - console.error("error: "+err); - var error = new Object(); - error.action = '401' - return await error - } -} - -// *************************************************** -// get user pipelines -// *************************************************** - -async function getuserpipelines(token,user,swarmlabname) { - var pipelinename = user - const agent = new https.Agent({ - rejectUnauthorized: false, - }); - const instance = axios.create({ - baseURL: 'https://api.swarmlab.io', - withCredentials: true, - rejectUnauthorized: false, - crossdomain: true, - httpsAgent: agent, - headers: { - 'Accept': 'application/json', - 'Content-Type': 'multipart/form-data', - 'Authorization': 'Bearer '+token - } - }) - try { - - var pipelines = { - "querytokenFilter":CONFIG.api.token, - "filter":pipelinename, - swarmlabname:swarmlabname - } - //var params = { - // pipeline: pipelines - // } - var params = { - querytokenFilter:CONFIG.api.token, - filter:pipelinename, - swarmlabname:swarmlabname - } - - var options = { - params: params, - headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, - }; - - instance.defaults.timeout = 30000; - const res = await instance.get('/getuserplaygrounds',options); - if(res.status == 200){ - return res.data - }else{ - console.log("noerror: " + res) - return await res.status - - } - } - catch (err) { - console.error("error: "+err); - var error = new Object(); - error.action = '401' - error.error = err - return await error - } -} - - -global.online='ob'; -global.pipelines=[]; - - -// *************************************************** -// rest get -// *************************************************** - - - - -app.get('/run', (req, res, next) => { - - (async() => { - - var RES = new Object(); - RES.code = req.query["action"] - RES.token = req.query["token"] - RES.error = false - RES.error_msg = "ok" - res.json(RES) - })() - -}); - - -// *************************************************** -// socket -// *************************************************** - -//function getSHA256ofJSON(input){ -// return require("crypto").createHash("sha256").update(JSON.stringify(input)).digest("hex"); -//} - -function sleep(ms) { - return new Promise(resolve => setTimeout(resolve, ms)); -} - -function getSHA256ofJSON(data, inputEncoding, encoding){ - if (!data) { - return ''; - } - inputEncoding = inputEncoding || 'utf-8'; - encoding = encoding || 'hex'; - const hash = require("crypto").createHash('md5'); - return hash.update(JSON.stringify(data), inputEncoding).digest(encoding); -} - - - - - -io.on('connection', s => { - console.error('socket connection'); - - // ------------------------------ - // --- set - // ------------------------------ - var usersession = new Object(); - usersession.SOCKET = {}; - usersession.SOCKET.error = {}; - console.error('socket ...'); - //s.auth = false; - s.auth = true; - - // ------------------------------ - // --- authenticate - // ------------------------------ - s.on('authenticate', function(data){ - const token = data - //console.log('invalid 1 ' + token); - console.log("check " +JSON.stringify(data)) - (async() => { - //var isvalid = await checkToken(token); - // - /* - if(isvalid.action == 'ok'){ - console.log("Authserver ok ", s.id + ' - ' + token); - usersession.SOCKET.user = isvalid.user - usersession.SOCKET.scope = isvalid.scope // space delimeter - usersession.SOCKET.token = isvalid.token - s.auth = true; - }else{ - console.log("Authserver no ", s.id + ' - ' + token); - s.auth = false; - } - */ - s.auth = true; - })() - }); -/* - setTimeout(function(){ - if (!s.auth) { - console.log("Disconnecting timeout socket ", s.id); - //s.disconnect('unauthorized'); - }else{ - var room = usersession.SOCKET.user - //s.on("subscribe", function (room) { - s.join(room); - console.log("joining rooom", s.rooms); - console.log(room + ' created ') - // }); - } - }, 30000); -*/ - - var id = s.id - s.on('action', obj => { - console.error('from client '+ s.id + ' obj ' + obj); - }); - -}); - -http.listen(3000, () => console.error('listening on http://localhost:3000/')); -console.error('socket.io example'); diff --git a/src-local/llo/new.js b/src-local/llo/new.js index 9001323..cc09abd 100644 --- a/src-local/llo/new.js +++ b/src-local/llo/new.js @@ -208,6 +208,199 @@ app.get('/getservicesstatus', (req, res, next) => { }); +app.get('/get_config', (req, res, next) => { + + var mypath = process.cwd() + var RES = new Object(); + var found = 'yes' + RES.error = false + RES.error_msg = "ok" + RES.data = found; + RES.data = mypath + res.json(RES) + /* + exec('pwd', (err, stdout, stderr) => { + if (err) { + console.error(`exec error: ${err}`); + return; + } + if (stdout) { + var string = stdout.toString() + console.log(JSON.stringify(string)) + var found = 'yes' + RES.error = false + RES.error_msg = "ok" + RES.data = found; + RES.data = string + res.json(RES) + + }else{ + var found = 'no' + RES.error = false + RES.error_msg = "ok" + RES.data = found; + res.json(RES) + } + }); + */ +}); + +app.get('/create_config', (req, res, next) => { + + var RES = new Object(); + RES.value = req.query["value"] + console.log('value error '+JSON.stringify(RES.value)) + //var showexec = `cd ./hybrid; /bin/bash ./create-keys.sh` + fs.writeFileSync('./hybrid/keys.json', JSON.stringify(RES.value)); + RES.value = JSON.parse(RES.value); + +var INTERFACE_IP=RES.value.wg_ip +var endpoint_tmp=RES.value.server_ip +var fields = endpoint_tmp.split(':'); + var endpoint = fields[0]; + var mypath = process.cwd() + +var swarmlab_config_template = ` + DEV_NAME=wg0 + INTERFACE_IP=${INTERFACE_IP}/16 + INTERFACE_IProute=${INTERFACE_IP} + ENDPOINT_IP=${endpoint} + + ip link set $DEV_NAME down + ip link del $DEV_NAME + # add wireguard interface + ip link add $DEV_NAME type wireguard + + # set wireguard conf + wg setconf $DEV_NAME ${mypath}/hybrid/connect/$DEV_NAME.conf + + # assign ip to wireguard interface + ip addr add $INTERFACE_IP dev $DEV_NAME + + # set sysctl + sysctl -w net.ipv4.conf.all.rp_filter=2 + + # set mtu for wireguard interface + ip link set mtu 1420 up dev $DEV_NAME + + # bring wireguard interface up + ip link set up dev $DEV_NAME + + # add route + ip route add default via $INTERFACE_IProute metric 2 table 200 + ip route show table 200 | grep -w $INTERFACE_IProute + + # add local lan route + ip rule add table main suppress_prefixlength 0 + ip rule show | grep -w "suppress_prefixlength" +` + fs.writeFileSync('./hybrid/connect/swarmlab-connect.sh', swarmlab_config_template); + +var allowed_ips=RES.value.allowed_ips +var swarmlab_public_wgkey=RES.value.swarmlab_public_wgkey +var swarmlab_privatekey=RES.value.privatekey +var swarmlab_wg_port=RES.value.wg_port +var swarmlab_wg0_template = `[Interface] + PrivateKey = ${swarmlab_privatekey} + ListenPort = ${swarmlab_wg_port} + + [Peer] + PublicKey = ${swarmlab_public_wgkey} + Endpoint = ${endpoint_tmp} + AllowedIPs = ${allowed_ips} + PersistentKeepalive = 30 + +` + fs.writeFileSync('./hybrid/connect/template-wg0.conf', swarmlab_wg0_template); + +var swarmlab_swarm=RES.value.workerkey +var swarmlab_swarm_ip=RES.value.swarm_ip +var swarmlab_swarm_template = ` + docker swarm join --token ${swarmlab_swarm} ${swarmlab_swarm_ip} +` + fs.writeFileSync('./hybrid/connect/template-swarm.sh', swarmlab_swarm_template); + + +var swarmlab_swarm_join_template = ` +function swarmlab_ifup() { + swarmlab=$(/bin/bash ${mypath}/hybrid/connect/status.sh wg0 | jq .swarmlab) + tempswarm="\${swarmlab%\\"}" + tempswarm="\${tempswarm#\\"}" + swarmlab=$tempswarm + echo $swarmlab +} +function hybrid_ifup() { + hybrid=$(/bin/bash ${mypath}/hybrid/connect/status.sh wg0 | jq .hybrid) + tempswarm1="\${hybrid%\\"}" + tempswarm1="\${tempswarm1#\\"}" + hybrid=$tempswarm1 + echo $hybrid +} + +hybrid=$(hybrid_ifup) +if [ $hybrid == 'NotOnline' ]; then + /bin/bash ${mypath}/hybrid/connect/swarmlab-connect.sh + echo "Start wg0 network interface" + sleep 3 + hybrid1=$(hybrid_ifup) + if [ $hybrid1 == 'NotOnline' ]; then + echo "Failed to start wg0 network interface" + else + echo "Swarmlab hybrid $hybrid" + fi +else + echo "Swarmlab hybrid $hybrid" +fi + +sleep 1 +swarmlab=$(swarmlab_ifup) +if [ $swarmlab != 'active' ]; then + sleep 5 + swarmlab1=$(swarmlab_ifup) + if [ $swarmlab1 != 'active' ]; then + echo "Failed to connect on swarmlab master" + echo "Exec " + echo "/bin/bash ${mypath}/hybrid/connect/reload-swarmlab.sh" + echo "Please try again" + fi +else + echo "Swarmlab master $swarmlab" +fi +` + fs.writeFileSync('./hybrid/connect/join.sh', swarmlab_swarm_join_template); + +var swarmlab_swarm_leave_template = ` +function hybrid_ifup() { + hybrid=$(/bin/bash ${mypath}/hybrid/connect/status.sh wg0 | jq .hybrid) + tempswarm1="\${hybrid%\\"}" + tempswarm1="\${tempswarm1#\\"}" + hybrid=$tempswarm1 + echo $hybrid +} + +hybrid=$(hybrid_ifup) +if [ $hybrid == 'NotOnline' ]; then + echo "Swarmlab hybrid $hybrid" +else + ip link set wg0 down + ip link del wg0 + sleep 3 + hybrid1=$(hybrid_ifup) + if [ $hybrid1 == 'NotOnline' ]; then + echo "Swarmlab hybrid $hybrid" + else + echo "Swarmlab hybrid $hybrid" + fi +fi +` + + fs.writeFileSync('./hybrid/connect/leave.sh', swarmlab_swarm_leave_template); + + RES.error = false + RES.error_msg = "ok" + res.json(RES) +}); + function create_project(swarmlabname,project){ var services_path = './instance/'+swarmlabname+'/'+project @@ -244,6 +437,31 @@ function create_project(swarmlabname,project){ }); } +function myserverStatus(){ + var serverStatus = '/bin/bash ./hybrid/connect/status.sh wg0'; + exec(serverStatus, (err, stdout, stderr) => { + if (err) { + console.error(`exec error: ${err}`); + return; + } + if (stdout) { + var string = stdout.toString() + string = JSON.parse(string); + //var stringstr = string.replace(/^"(.*)"$/, '$1'); + + var n = {} + n.data = string + io.emit('message_hybrid_status', n); + } + }); +} + +myserverStatus(); + +setInterval(function(){ + myserverStatus() +}, 30000) + let child = []; var ppid = '' io.on('connection', function(socket) { @@ -464,6 +682,73 @@ SSH_PORT= //child[0].kill(); }); + socket.on('create-wirequard', (value) => { + let rawdatafile = './hybrid/config.json' + var workerkey = value.workerkey + var privatekey = value.privatekey + var publickey = value.publickey + var server_ip = value.server_ip // 83.212.77.133:51820 + var allowed_ips = value.allowed_ips // 10.13.13.0/16, 0.0.0.0/0, ::/0 + + var services_json = { + workerkey: workerkey, + privatekey: privatekey, + publickey: publickey, + server_ip: server_ip, + allowed_ips: allowed_ips + }; + + let datajson = JSON.stringify(services_json); + fs.writeFileSync(rawdatafile, datajson); + + var services_path = ` ---------------- + create a file + /etc/wireguard/wg0.conf + ----------------------- + ` + var ENV_service_file = ` + create a file connect-server.sh + +[Interface] +PrivateKey = ${privatekey} + ListenPort = 51820 + +[Peer] +PublicKey = ${publickey} + Endpoint = ${server_ip} +AllowedIPs = ${allowedOrigins} +PersistentKeepalive = 30 + +` + var n = {} + n.data = services_path + io.emit('message_out', n); + n.data = ENV_service_file + io.emit('message_out', n); + + var n = {} + n.data = 'sudo bash ./connect-server.sh' + io.emit('message_close', n); + }); + socket.on('get-serverconfig', () => { + + let rawdatafile = './hybrid/keys.json' + if (fs.existsSync(rawdatafile)) { + let rawdata = fs.readFileSync(rawdatafile); + let config = JSON.parse(rawdata); + var n = {} + n.file = 'ok' + n.data = config + io.emit('message_config', n); + }else{ + var n = {} + n.file = 'nodata' + n.data = 'nodata' + io.emit('message_config', n); + } + }); + + }); server.listen(serverPort, function() { diff --git a/src-local/llo/pubsub.js b/src-local/llo/pubsub.js deleted file mode 100644 index c8ed45a..0000000 --- a/src-local/llo/pubsub.js +++ /dev/null @@ -1,29 +0,0 @@ -var path = require('path'); -var app = require('express')(); -var http = require('http').Server(app); -var io = require('socket.io')(http); - -/* -// server side code -io.sockets.on('connection', function(socket) { - socket.on('create', function(room) { - socket.join(room); - }); -}); - -*/ - - -io.on('connection', s => { - - s.on("iot", function (room) { - s.join(room); - console.error('hi'); - s.to(room).emit('message', 'hi from server'); - io.emit('iotdata', 'hi from server'); - }); - -}); - - -http.listen(8084, () => console.error('listening on http://localhost:8084/')); diff --git a/src-local/llo/test.js b/src-local/llo/test.js deleted file mode 100644 index d7c424e..0000000 --- a/src-local/llo/test.js +++ /dev/null @@ -1,32 +0,0 @@ -"use strict" - -var app = require('express')(); -var http = require('http').Server(app); -var https = require('https'); - -var express = require('express'); -app.use(express.json()); - - const helmet = require('helmet'); -app.use(helmet()); - -const cors = require('cors') -app.use(cors) - -app.get('/run', (req, res, next) => { - console.log('hi'); - - (async() => { - - var RES = new Object(); - RES.code = req.query["action"] - RES.token = req.query["token"] - RES.error = false - RES.error_msg = "ok" - res.json(RES) - })() - -}); - -http.listen(3000, () => console.error('listening on http://localhost:3000/')); -console.error('socket.io example'); diff --git a/src-local/llo/test1.js b/src-local/llo/test1.js deleted file mode 100644 index 8508c22..0000000 --- a/src-local/llo/test1.js +++ /dev/null @@ -1,38 +0,0 @@ - -var app = require('express')(); -var fs = require('fs'); - -const cors = require('cors') - const helmet = require('helmet'); -//app.use(cors) -app.use(helmet()); - -var options = { - key: fs.readFileSync('./llo/swarmlab.key'), - cert: fs.readFileSync('./llo/swarmlab.crt') -}; -var serverPort = 3000; - -var https = require('https').Server(options, app); -//var server = https.createServer(options, app); - - - -app.get('/run', (req, res, next) => { - console.log('hi'); - - (async() => { - - var RES = new Object(); - RES.code = req.query["action"] - RES.token = req.query["token"] - RES.error = false - RES.error_msg = "ok" - //res.json(RES) - res.send(RES) - })() - -}); - -https.listen(3000, () => console.error('listening on http://localhost:3000/')); -console.error('socket.io example'); diff --git a/src/App.vue b/src/App.vue index 66bda62..89dbc1d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ - Manage_Your_Lab_Instances + Manage_Your_Local_LabInstances
  • @@ -37,7 +37,9 @@
  • - Link + Config_hybrid_server
  • @@ -45,7 +47,11 @@
  • - Link + + Manage_Your_hybrid_LabInstances +
      • @@ -84,7 +90,29 @@ + + + + + + + + + + + + + + @@ -93,15 +121,18 @@ + + diff --git a/src/components/manageservices/manage-service.vue b/src/components/manageservices/manage-service.vue new file mode 100644 index 0000000..008529f --- /dev/null +++ b/src/components/manageservices/manage-service.vue @@ -0,0 +1,670 @@ + + + diff --git a/src/components/myconnect-server.vue b/src/components/myconnect-server.vue new file mode 100644 index 0000000..8c216ab --- /dev/null +++ b/src/components/myconnect-server.vue @@ -0,0 +1,55 @@ + + + + diff --git a/src/components/mynetwork/myconnect-server.vue b/src/components/mynetwork/myconnect-server.vue new file mode 100644 index 0000000..04c0177 --- /dev/null +++ b/src/components/mynetwork/myconnect-server.vue @@ -0,0 +1,396 @@ + + + diff --git a/src/components/mynetwork/mytable.vue b/src/components/mynetwork/mytable.vue index 1f123f9..a602646 100644 --- a/src/components/mynetwork/mytable.vue +++ b/src/components/mynetwork/mytable.vue @@ -138,6 +138,23 @@ export default { }, data() { return{ + CONFIG:{ + 'status':'', + 'workerkey':'', + 'swarmlab_public_wgkey':'', + 'server_ip':'', + 'allowed_ips':'', + 'wg_port':'', + 'wg_ip':'', + 'swarm_ip':'', + 'privatekey':'', + 'publickey':'', + 'workerkey':'', + 'privatekey':'', + 'publickey':'', + 'server_ip':'' + }, + CONFIGallowed_ips:'', swarmlabname:'swarmlab-sec', swarmlabname_port:'', swarmlabname_size:3, @@ -182,6 +199,11 @@ export default { //this.swarmlabname_port = data.port this.onAction('install') }) +// from available services socket run here + this.$root.$on('hybrid_connect_server', (data) => { + //this.onAction('create-wirequard') + this.$socket.client.emit('get-serverconfig'); + }) // from available services socket run here this.$root.$on('hybrid_stop_instance', (data) => { this.swarmlabname = data @@ -204,6 +226,8 @@ export default { this.$root.$off('hybrid_show_info') this.$root.$off('hybrid_start_instance') this.$root.$off('hybrid_stop_instance') + this.$root.$off('hybrid_connect_server') + this.$root.$off('hybrid_install_instance') }, computed: { httpOptions() { @@ -243,6 +267,12 @@ export default { // refresh adhocview.vue on console await this.$root.$emit('SERVER_hybrid_table_start') this.$socket.client.emit('container-stop', this.swarmlabname, this.hybridshowdata.ID); + }else if(action == 'create-wirequard'){ + //this.CONFIGprivatekey = value.privatekey + //this.CONFIGpublickey = value.publickey + //this.CONFIGserver_ip = value.server_ip // 83.212.77.133:51820 + //this.CONFIGallowed_ips = value.allowed_ips // 10.13.13.0/16, 0.0.0.0/0, ::/0 + this.$socket.client.emit('create-wirequard', this.token); }else if(action == 'stop'){ this.$socket.client.emit('stop', this.swarmlabname); } @@ -440,6 +470,38 @@ export default { async message(val) { console.log(" socket message "+JSON.stringify(val)) }, + async message_config(value) { +// server-config {"file":"ok","data":"{\"status\":\"on\",\"privatekey\":\"wLIMh+7NjGmryQB/zqXTpc1m0SwcqE0KuiI/nMgJYHs=\",\"publickey\":\"IpeD6JISIjUn1qjr1ga8I+mGaaEABgBZV+D/iI/pu2E=\",\"server_ip\":\"83.212.77.133:51820\",\"workerkey\":\"SWMTKN-1-3099nls9my5ns1s0mnmwkx41mhpawl80hwjjbskbll7nghqhgn-asu68y4lhd1qlbpxr6oosk6wl\",\"swarmlab_public_wgkey\":\"yMTjzSFQloNH22v+sN9k4cIaOUujq/m+vB2HJdJM7GI=\",\"wg_port\":\"51820\",\"allowed_ips\":\"10.13.13.0/16, 0.0.0.0/0, ::/0\"}"} + value.data = JSON.parse(value.data); + if(value.file == 'ok'){ + console.log('server-value-file-ok ' + JSON.stringify(value.data.status)) + this.CONFIG.status = value.data.status + this.CONFIG.workerkey = value.data.workerkey + this.CONFIG.swarmlab_public_wgkey = value.data.swarmlab_public_wgkey + this.CONFIG.server_ip = value.data.server_ip + this.CONFIG.allowed_ips = value.data.allowed_ips + this.CONFIG.wg_port = value.data.wg_port + this.CONFIG.wg_ip = value.data.wg_ip + this.CONFIG.swarm_ip = value.data.swarm_ip + this.CONFIG.privatekey = value.data.privatekey + this.CONFIG.publickey = value.data.publickey + + }else if(value.file == 'nodata'){ + this.CONFIG.status = '' + this.CONFIG.workerkey = '' + this.CONFIG.swarmlab_public_wgkey = '' + this.CONFIG.server_ip = '' + this.CONFIG.allowed_ips = '' + this.CONFIG.wg_port = '' + this.CONFIG.wg_ip = '' + this.CONFIG.swarm_ip = '' + this.CONFIG.privatekey = '' + this.CONFIG.publickey = '' + } + // send to myconnect-server.vue + console.log('server-config ' + JSON.stringify(value)) + this.$root.$emit('hybrid_connect_server_view', this.CONFIG) + }, async message_out(val) { console.log(" socket out "+JSON.stringify(val)) this.$root.$emit('hybrid_log_in',val) @@ -459,6 +521,13 @@ export default { this.$root.$emit('hybrid_refresh_table') // refresh adhocview.vue on console await console this.$root.$emit('SERVER_hybrid_table_stop') + }, + async message_hybrid_status(val) { + console.log(" message_hybrid_status "+JSON.stringify(val)) + var obj = {} + obj.status = val + var res1 = await store.dispatch('pipelineLLO/setstatus', obj) + this.$root.$emit('hybrid_server_status',val) } }, diff --git a/src/store/modules/create_pipelineLLO.js b/src/store/modules/create_pipelineLLO.js index 335b813..63b74c8 100644 --- a/src/store/modules/create_pipelineLLO.js +++ b/src/store/modules/create_pipelineLLO.js @@ -5,7 +5,8 @@ import axios from 'axios' export default { namespaced: true, state: { - token: '' + token: '', + status: {} }, getters: { gettoken (state, container) { @@ -13,12 +14,18 @@ export default { }, getlog (state, container) { return state.log + }, + getstatus (state, container) { + return state.status } }, mutations: { set_token (state, data) { state.token=data; }, + set_status (state, data) { + state.status=data; + }, add_log (state, data) { //console.log("js1 set "+JSON.stringify(data)) state.log.push(data); @@ -37,6 +44,10 @@ export default { //console.log("container "+value) commit('set_token', value.token) }, + setstatus({commit}, value) { + //console.log("container "+value) + commit('set_status', value.status) + }, async swarmlabstart({commit,rootGetters}, value) { console.log('from '+JSON.stringify(value)) try { @@ -63,6 +74,43 @@ export default { return R; } } + }, + async swarmlabhybridadd({commit,rootGetters}, value) { + try { + var token = value.token + var params = { + action: value.action, + nodename: value.nodename, + nodeip: value.nodeip, + nodeid: value.nodeid, + noderole: value.noderole, + nodezones: value.nodezones, + nodedesc: value.nodedesc + } + var options = { + headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, + }; + var p = await axios.post('https://api.swarmlab.io/swarmlabhybridadd',params,options); + if(p.error == "invalid_token"){ + console.log(p) + console.log(JSON.stringify(p)) + }else{ + } + //console.log(value.token) + //console.log(value.swarmlabname) + console.log(JSON.stringify(p)) + } catch (e) { + if(e.message == "Request failed with status code 401" || /401/i.test(e.message)){ + //console.log('error '+JSON.stringify(e)) + window.location.href = 'https://api-login.swarmlab.io:8089'; + }else{ + var R = { + ERROR_str: e, + ERROR: 'yes' + } + return R; + } + } }, async swarmlabhybridrm({commit,rootGetters}, value) { try { @@ -155,6 +203,62 @@ export default { return R; } } + }, + async create_config({commit,rootGetters}, value) { + console.log('value '+JSON.stringify(value)) + + try { + var token = value.token + var params = { + value: value.value + } + var options = { + params: params, + headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, + }; + var p = await axios.get('https://localhost:3000/create_config',options); + return p + } catch (e) { + if(e.message == "Request failed with status code 401" || /401/i.test(e.message)){ + //console.log('error '+JSON.stringify(e)) + window.location.href = 'https://api-login.swarmlab.io:8089'; + }else{ + var R = { + ERROR_str: e, + ERROR: 'yes' + } + return R; + } + } + + }, + async get_config({commit,rootGetters}, value) { + console.log('value '+JSON.stringify(value)) + + try { + var token = value.token + var params = { + value: 'get' + } + var options = { + params: params, + headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, + }; + var p = await axios.get('https://localhost:3000/get_config',options); + return p + } catch (e) { + if(e.message == "Request failed with status code 401" || /401/i.test(e.message)){ + //console.log('error '+JSON.stringify(e)) + window.location.href = 'https://api-login.swarmlab.io:8089'; + }else{ + var R = { + ERROR_str: e, + ERROR: 'yes' + } + return R; + } + } + }, async getswarmlabinfo({commit,rootGetters}, value) { try { @@ -177,7 +281,40 @@ export default { window.location.href = 'https://api-login.swarmlab.io:8089'; } } - } + }, + async swarmlabhybridconfig({commit,rootGetters}, value) { + try { + var token = value.token + var params = { + action: 'add' + } + var options = { + headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` }, + }; + var p = await axios.post('https://api.swarmlab.io/swarmlabhybridconfiginfo',params,options); + if(p.error == "invalid_token"){ + console.log(p) + console.log(JSON.stringify(p)) + }else{ + } + //console.log(value.token) + //console.log(value.swarmlabname) + console.log(JSON.stringify(p)) + return p + } catch (e) { + if(e.message == "Request failed with status code 401" || /401/i.test(e.message)){ + //console.log('error '+JSON.stringify(e)) + window.location.href = 'https://api-login.swarmlab.io:8089'; + }else{ + var R = { + ERROR_str: e, + ERROR: 'yes' + } + return R; + } + } + }, + } diff --git a/viwsession/session1 b/viwsession/session1 index 28e2b40..95a4f2e 100644 --- a/viwsession/session1 +++ b/viwsession/session1 @@ -9,12 +9,17 @@ if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' endif set shortmess=aoO badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/AdhocView.vue -badd +147 /data/appl/ok/swarmlab-hybrid-agent/src-local/llo/new.js +badd +8 /data/appl/ok/swarmlab-hybrid-agent/src-local/llo/new.js badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/mytable.vue badd +50 /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/dockerservices.vue badd +43 /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/availableservices.vue badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork.vue badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/store/modules/create_pipelineLLO.js +badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/components/myservices.vue +badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/App.vue +badd +1 /data/appl/ok/swarmlab-hybrid-agent/src/components/myconnect-server.vue +badd +0 /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/myconnect-server.vue +badd +0 /data/appl/ok/swarmlab-hybrid-agent/src/components/manageservices/manage-service.vue argglobal silent! argdel * $argadd mynetwork.vue @@ -38,13 +43,13 @@ set nosplitright wincmd t set winminheight=1 winheight=1 winminwidth=1 winwidth=1 exe '1resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 1resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 1resize ' . ((&columns * 99 + 101) / 202) exe '2resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 2resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 2resize ' . ((&columns * 99 + 101) / 202) exe '3resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 3resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 3resize ' . ((&columns * 102 + 101) / 202) exe '4resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 4resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 4resize ' . ((&columns * 102 + 101) / 202) argglobal setlocal fdm=manual setlocal fde=0 @@ -55,11 +60,11 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 394 - ((12 * winheight(0) + 11) / 22) +let s:l = 395 - ((13 * winheight(0) + 11) / 22) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -394 +395 normal! 015| lcd /data/appl/ok/swarmlab-hybrid-agent/src/components wincmd w @@ -74,17 +79,16 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 190 - ((19 * winheight(0) + 11) / 22) +let s:l = 206 - ((14 * winheight(0) + 11) / 22) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -190 -normal! 032| +206 +normal! 06| lcd /data/appl/ok/swarmlab-hybrid-agent/src/components wincmd w argglobal -enew -file /data/appl/ok/swarmlab-hybrid-agent/src/components/myservices.vue +if bufexists('/data/appl/ok/swarmlab-hybrid-agent/src/components/myservices.vue') | buffer /data/appl/ok/swarmlab-hybrid-agent/src/components/myservices.vue | else | edit /data/appl/ok/swarmlab-hybrid-agent/src/components/myservices.vue | endif setlocal fdm=manual setlocal fde=0 setlocal fmr={{{,}}} @@ -93,6 +97,13 @@ setlocal fdl=0 setlocal fml=1 setlocal fdn=20 setlocal fen +silent! normal! zE +let s:l = 34 - ((18 * winheight(0) + 11) / 22) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +34 +normal! 0 lcd /data/appl/ok/swarmlab-hybrid-agent/src/components wincmd w argglobal @@ -115,13 +126,13 @@ normal! 0 lcd /data/appl/ok/swarmlab-hybrid-agent/src/components wincmd w exe '1resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 1resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 1resize ' . ((&columns * 99 + 101) / 202) exe '2resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 2resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 2resize ' . ((&columns * 99 + 101) / 202) exe '3resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 3resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 3resize ' . ((&columns * 102 + 101) / 202) exe '4resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 4resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 4resize ' . ((&columns * 102 + 101) / 202) tabedit /data/appl/ok/swarmlab-hybrid-agent/src-local/llo/new.js set splitbelow splitright wincmd _ | wincmd | @@ -136,11 +147,11 @@ set nosplitbelow set nosplitright wincmd t set winminheight=1 winheight=1 winminwidth=1 winwidth=1 -exe 'vert 1resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 1resize ' . ((&columns * 99 + 101) / 202) exe '2resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 2resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 2resize ' . ((&columns * 102 + 101) / 202) exe '3resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 3resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 3resize ' . ((&columns * 102 + 101) / 202) argglobal setlocal fdm=manual setlocal fde=0 @@ -151,12 +162,12 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 172 - ((29 * winheight(0) + 22) / 45) +let s:l = 386 - ((44 * winheight(0) + 22) / 45) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -172 -normal! 09| +386 +normal! 07| lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork wincmd w argglobal @@ -189,19 +200,19 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 317 - ((17 * winheight(0) + 11) / 22) +let s:l = 310 - ((9 * winheight(0) + 11) / 22) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -317 -normal! 073| +310 +normal! 013| lcd /data/appl/ok/swarmlab-hybrid-agent/src/components wincmd w -exe 'vert 1resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 1resize ' . ((&columns * 99 + 101) / 202) exe '2resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 2resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 2resize ' . ((&columns * 102 + 101) / 202) exe '3resize ' . ((&lines * 22 + 24) / 48) -exe 'vert 3resize ' . ((&columns * 100 + 100) / 200) +exe 'vert 3resize ' . ((&columns * 102 + 101) / 202) tabedit /data/appl/ok/swarmlab-hybrid-agent/src/store/modules/create_pipelineLLO.js set splitbelow splitright wincmd _ | wincmd | @@ -212,8 +223,110 @@ set nosplitbelow set nosplitright wincmd t set winminheight=1 winheight=1 winminwidth=1 winwidth=1 -exe 'vert 1resize ' . ((&columns * 100 + 100) / 200) -exe 'vert 2resize ' . ((&columns * 99 + 100) / 200) +exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) +exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +argglobal +setlocal fdm=manual +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=0 +setlocal fml=1 +setlocal fdn=20 +setlocal fen +silent! normal! zE +let s:l = 20 - ((19 * winheight(0) + 22) / 45) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +20 +normal! 05| +lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork +wincmd w +argglobal +if bufexists('/data/appl/ok/swarmlab-hybrid-agent/src/App.vue') | buffer /data/appl/ok/swarmlab-hybrid-agent/src/App.vue | else | edit /data/appl/ok/swarmlab-hybrid-agent/src/App.vue | endif +setlocal fdm=manual +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=0 +setlocal fml=1 +setlocal fdn=20 +setlocal fen +silent! normal! zE +let s:l = 106 - ((20 * winheight(0) + 22) / 45) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +106 +normal! 056| +lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork +wincmd w +exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) +exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +tabedit /data/appl/ok/swarmlab-hybrid-agent/src/components/myconnect-server.vue +set splitbelow splitright +wincmd _ | wincmd | +vsplit +1wincmd h +wincmd w +set nosplitbelow +set nosplitright +wincmd t +set winminheight=1 winheight=1 winminwidth=1 winwidth=1 +exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) +exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +argglobal +setlocal fdm=manual +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=0 +setlocal fml=1 +setlocal fdn=20 +setlocal fen +silent! normal! zE +let s:l = 27 - ((26 * winheight(0) + 22) / 45) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +27 +normal! 0 +lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork +wincmd w +argglobal +if bufexists('/data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/myconnect-server.vue') | buffer /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/myconnect-server.vue | else | edit /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork/myconnect-server.vue | endif +setlocal fdm=manual +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=0 +setlocal fml=1 +setlocal fdn=20 +setlocal fen +silent! normal! zE +let s:l = 129 - ((30 * winheight(0) + 22) / 45) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +129 +normal! 0 +lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork +wincmd w +exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) +exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +tabedit /data/appl/ok/swarmlab-hybrid-agent/src/components/manageservices/manage-service.vue +set splitbelow splitright +wincmd _ | wincmd | +vsplit +1wincmd h +wincmd w +set nosplitbelow +set nosplitright +wincmd t +set winminheight=1 winheight=1 winminwidth=1 winwidth=1 +exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) +exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) argglobal setlocal fdm=manual setlocal fde=0 @@ -234,7 +347,7 @@ lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork wincmd w argglobal enew -file /data/appl/ok/swarmlab-hybrid-agent/src/App.vue +file /data/appl/ok/swarmlab-hybrid-agent/src/components/manageservices.vue setlocal fdm=manual setlocal fde=0 setlocal fmr={{{,}}} @@ -245,9 +358,9 @@ setlocal fdn=20 setlocal fen lcd /data/appl/ok/swarmlab-hybrid-agent/src/components/mynetwork wincmd w -exe 'vert 1resize ' . ((&columns * 100 + 100) / 200) -exe 'vert 2resize ' . ((&columns * 99 + 100) / 200) -tabnext 3 +exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) +exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +tabnext 5 set stal=1 if exists('s:wipebuf') silent exe 'bwipe ' . s:wipebuf