Fixed bugs

Author: SloCompTech

auth.js

@@ -24,7 +24,7 @@ const init = async function (req, res, next) {
  const raw = Buffer.from(val, 'base64').toString('utf8');
  const credentials = raw.split(':');
  const token = await portainer.login(credentials[0] || process.env.PORTAINER_USER, credentials[1] || process.env.PORTAINER_PASS);
- req.token = val;
+ req.token = token;
  req.user = jwt.decode(token);
  }
  } catch (e) {

handlers/default.js

@@ -1,9 +1,31 @@
 /**
  * Default deploy request handler
  */
+const Joi = require('@hapi/joi');
+const portainer = require('../portainer');
 
+const dataSchema = Joi.object().keys({
+ stack: Joi.string().required(),
+ env: Joi.object().required(),
+}).required();
 const handle = async (req, res, data) => {
- res.send('Hello cow');
+ const datav = await dataSchema.validateAsync(data);
+ const stackptr = await portainer.getStack(req.token, datav.stack);
+ if (!stackptr)
+ throw new Error('Stack not found');
+ 
+ // Update environment variables (do not create non existing vars)
+ const keys = Object.keys(datav.env);
+ for (const key of keys) {
+ for (const env of stackptr.Env) { // Check if value in list
+ if (env.name === key)
+ env.value = datav.env[key]; // Update value
+ }
+ }
+
+ await portainer.updateStack(req.token, stackptr);
+
+ res.status(200).end();
 }
 
 module.exports = {

main.js

@@ -58,6 +58,7 @@ const bodyParser = require('body-parser');
 const compression = require('compression');
 const express = require('express');
 const helmet = require('helmet');
+const util = require('util');
 const validate = require('./validate');
 
 const app = express();
@@ -78,10 +79,9 @@ const deployRequestSchema = Joi.object().keys({
  data: Joi.any(),
 });
 app.post('/', auth.isAuthenticated, validate.validate(deployRequestSchema), as.wrap(async (req, res) => {
- console.log('Here');
  const handlerName = req.body.handler;
  if (handlers[handlerName] && handlers[handlerName].handle) {
- if (handlers[handlerName].handle instanceof Promise) {
+ if (util.types.isAsyncFunction(handlers[handlerName].handle) || util.types.isPromise(handlers[handlerName].handle)) {
  await handlers[handlerName].handle(req, res, req.body.data);
  } else {
  handlers[handlerName].handle(req, res, req.body.data);

portainer.js

@@ -3,6 +3,7 @@
  */
 const axios = require('axios').default;
 const fs = require('fs');
+const path = require('path');
 
 /**
  * Login into portainer
@@ -38,7 +39,7 @@ const getStack = async function (token, name) {
  filters: { name: name },
  },
  });
-
+ 
  // React to portainer error
  if (response.err)
  throw new Error(response.err);
@@ -53,8 +54,9 @@ const getStack = async function (token, name) {
  * @param {Stack} stack 
  */
 const updateStack = async function (token, stack) {
- const response = await axios.put(`${process.env.PORTAINER_API}/stacks/${stack.id}`, {
- 'StackFileContent': await fs.readFile(path.join(process.env.PORTAINER_DIR,`${stack.ProjectPath.replace(/~\/data/, '')}/${stack.EntryPoint}`)),
+ const stackfile = await fs.promises.readFile(path.join(process.env.PORTAINER_DIR,`${stack.ProjectPath.replace('/data/', '')}/${stack.EntryPoint}`), 'utf8');
+ const response = await axios.put(`${process.env.PORTAINER_API}/stacks/${stack.Id}`, {
+ 'StackFileContent': stackfile,
  'Env': stack.Env,
  }, {
  headers: {