GitHub-Bitwarden
/
cli
mirror of https://github.com/bitwarden/cli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

change to koa to support async/await

serve-fixes
Kyle Spearrin 4 years ago
parent
a4c22b8d4e
commit
4ffe6f3183
4 changed files with 946 additions and 608 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      .vscode/launch.json
  2. 1295
      package-lock.json
  3. 15
      package.json
  4. 234
      src/commands/serve.command.ts

10
.vscode/launch.json vendored
Unescape View File

@ -8,7 +8,15 @@ @@ -8,7 +8,15 @@
"protocol": "inspector",
"cwd": "${workspaceRoot}",
"program": "${workspaceFolder}/build/bw.js",
"args": ["login", "sdfsd@sdfdf.com", "ddddddd"]
"sourceMapPathOverrides": {
"meteor://💻app/*": "${workspaceFolder}/*",
"webpack:///./~/*": "${workspaceFolder}/node_modules/*",
"webpack://?:*/*": "${workspaceFolder}/*",
"webpack://@bitwarden/cli/*": "${workspaceFolder}/*"
},
"smartStep": true,
"console": "integratedTerminal",
"args": ["serve"]
}
]
}

1295
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

15
package.json
Unescape View File

@ -54,13 +54,16 @@ @@ -54,13 +54,16 @@
},
"devDependencies": {
"@fluffy-spoon/substitute": "^1.208.0",
"@types/express": "^4.17.13",
"@types/inquirer": "^7.3.1",
"@types/jasmine": "^3.7.0",
"@types/jsdom": "^16.2.10",
"@types/koa": "^2.13.4",
"@types/koa__multer": "^2.0.4",
"@types/koa__router": "^8.0.11",
"@types/koa-bodyparser": "^4.3.5",
"@types/koa-json": "^2.0.20",
"@types/lowdb": "^1.0.10",
"@types/lunr": "^2.3.3",
"@types/multer": "^1.4.7",
"@types/node": "^16.11.12",
"@types/node-fetch": "^2.5.10",
"@types/node-forge": "^0.9.7",
@ -93,18 +96,22 @@ @@ -93,18 +96,22 @@
"webpack-node-externals": "^3.0.0"
},
"dependencies": {
"@koa/multer": "^3.0.0",
"@koa/router": "^10.1.1",
"big-integer": "1.6.48",
"browser-hrtime": "^1.1.8",
"chalk": "^4.1.1",
"commander": "7.2.0",
"express": "^4.17.1",
"form-data": "4.0.0",
"https-proxy-agent": "5.0.0",
"inquirer": "8.0.0",
"jsdom": "^16.5.3",
"koa": "^2.13.4",
"koa-bodyparser": "^4.3.0",
"koa-json": "^2.0.2",
"lowdb": "1.0.0",
"lunr": "^2.3.9",
"multer": "^1.4.3",
"multer": "^1.4.4",
"node-fetch": "^2.6.1",
"node-forge": "0.10.0",
"open": "^8.0.8",

234
src/commands/serve.command.ts
Unescape View File

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
import * as koaMulter from "@koa/multer";
import * as koaRouter from "@koa/router";
import * as program from "commander";
import * as express from "express";
import * as multer from "multer";
import * as koa from "koa";
import * as koaBodyParser from "koa-bodyparser";
import * as koaJson from "koa-json";
import { Main } from "../bw";
@ -144,158 +147,211 @@ export class ServeCommand { @@ -144,158 +147,211 @@ export class ServeCommand {
async run(options: program.OptionValues) {
const port = options.port || 8087;
const server = express();
const server = new koa();
const router = new koaRouter();
process.env.BW_SERVE = "true";
process.env.BW_NOINTERACTION = "true";
server.use(express.json());
server.use((req, res, next) => {
const sessionHeader = req.get("Session");
if (sessionHeader != null && sessionHeader !== "") {
process.env.BW_SESSION = sessionHeader;
}
next();
});
server
.use(koaBodyParser())
.use(koaJson({ pretty: false, param: "pretty" }))
.use(async (ctx, next) => {
const sessionHeader = ctx.request.get("Session");
if (sessionHeader != null && sessionHeader !== "") {
process.env.BW_SESSION = sessionHeader;
}
await next();
});
server.get("/generate", async (req, res) => {
const response = await this.generateCommand.run(req.query);
this.processResponse(res, response);
router.get("/generate", async (ctx, next) => {
const response = await this.generateCommand.run(ctx.request.query);
this.processResponse(ctx.response, response);
await next();
});
server.get("/status", async (req, res) => {
router.get("/status", async (ctx, next) => {
const response = await this.statusCommand.run();
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.get("/list/:object", async (req, res) => {
router.get("/list/:object", async (ctx, next) => {
let response: Response = null;
if (req.params.object === "send") {
response = await this.sendListCommand.run(req.query);
if (ctx.params.object === "send") {
response = await this.sendListCommand.run(ctx.request.query);
} else {
response = await this.listCommand.run(req.params.object, req.query);
response = await this.listCommand.run(ctx.params.object, ctx.request.query);
}
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.get("/send/list", async (req, res) => {
const response = await this.sendListCommand.run(req.query);
this.processResponse(res, response);
router.get("/send/list", async (ctx, next) => {
const response = await this.sendListCommand.run(ctx.request.query);
this.processResponse(ctx.response, response);
await next();
});
server.post("/sync", async (req, res) => {
const response = await this.syncCommand.run(req.query);
this.processResponse(res, response);
router.post("/sync", async (ctx, next) => {
const response = await this.syncCommand.run(ctx.request.query);
this.processResponse(ctx.response, response);
await next();
});
server.post("/lock", async (req, res) => {
router.post("/lock", async (ctx, next) => {
const response = await this.lockCommand.run();
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.post("/unlock", async (req, res) => {
router.post("/unlock", async (ctx, next) => {
const response = await this.unlockCommand.run(
req.body == null ? null : (req.body.password as string),
req.query
ctx.request.body.password == null ? null : (ctx.request.body.password as string),
ctx.request.query
);
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.post("/confirm/:object/:id", async (req, res) => {
const response = await this.confirmCommand.run(req.params.object, req.params.id, req.query);
this.processResponse(res, response);
router.post("/confirm/:object/:id", async (ctx, next) => {
const response = await this.confirmCommand.run(
ctx.params.object,
ctx.params.id,
ctx.request.query
);
this.processResponse(ctx.response, response);
await next();
});
server.post("/restore/:object/:id", async (req, res) => {
const response = await this.restoreCommand.run(req.params.object, req.params.id);
this.processResponse(res, response);
router.post("/restore/:object/:id", async (ctx, next) => {
const response = await this.restoreCommand.run(ctx.params.object, ctx.params.id);
this.processResponse(ctx.response, response);
await next();
});
server.post("/move/:id/:organizationId", async (req, res) => {
router.post("/move/:id/:organizationId", async (ctx, next) => {
const response = await this.shareCommand.run(
req.params.id,
req.params.organizationId,
req.body
ctx.params.id,
ctx.params.organizationId,
ctx.request.body // TODO: Check the format of this body for an array of collection ids
);
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.post("/attachment", multer().single("file"), async (req, res) => {
const response = await this.createCommand.run("attachment", req.body, req.query, {
fileBuffer: req.file.buffer,
fileName: req.file.originalname,
});
this.processResponse(res, response);
router.post("/attachment", koaMulter().single("file"), async (ctx, next) => {
const response = await this.createCommand.run(
"attachment",
ctx.request.body,
ctx.request.query,
{
fileBuffer: ctx.request.file.buffer,
fileName: ctx.request.file.originalname,
}
);
this.processResponse(ctx.response, response);
await next();
});
server.post("/send/:id/remove-password", async (req, res) => {
const response = await this.sendRemovePasswordCommand.run(req.params.id);
this.processResponse(res, response);
router.post("/send/:id/remove-password", async (ctx, next) => {
const response = await this.sendRemovePasswordCommand.run(ctx.params.id);
this.processResponse(ctx.response, response);
await next();
});
server.post("/:object", async (req, res) => {
router.post("/:object", async (ctx, next) => {
if (this.alreadyRespondedTo(ctx.response)) {
return;
}
let response: Response = null;
if (req.params.object === "send") {
response = await this.sendCreateCommand.run(req.body, req.query);
if (ctx.params.object === "send") {
response = await this.sendCreateCommand.run(ctx.request.body, ctx.request.query);
} else {
response = await this.createCommand.run(req.params.object, req.body, req.query);
response = await this.createCommand.run(
ctx.params.object,
ctx.request.body,
ctx.request.query
);
}
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.put("/:object/:id", async (req, res) => {
router.put("/:object/:id", async (ctx, next) => {
if (this.alreadyRespondedTo(ctx.response)) {
return;
}
let response: Response = null;
if (req.params.object === "send") {
req.body.id = req.params.id;
response = await this.sendEditCommand.run(req.body, req.query);
if (ctx.params.object === "send") {
ctx.request.body.id = ctx.params.id;
response = await this.sendEditCommand.run(ctx.request.body, ctx.request.query);
} else {
response = await this.editCommand.run(
req.params.object,
req.params.id,
req.body,
req.query
ctx.params.object,
ctx.params.id,
ctx.request.body,
ctx.request.query
);
}
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.get("/:object/:id", async (req, res) => {
router.get("/:object/:id", async (ctx, next) => {
if (this.alreadyRespondedTo(ctx.response)) {
return;
}
let response: Response = null;
if (req.params.object === "send") {
response = await this.sendGetCommand.run(req.params.id, null);
if (ctx.params.object === "send") {
response = await this.sendGetCommand.run(ctx.params.id, null);
} else {
response = await this.getCommand.run(req.params.object, req.params.id, req.query);
response = await this.getCommand.run(ctx.params.object, ctx.params.id, ctx.request.query);
}
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.delete("/:object/:id", async (req, res) => {
router.delete("/:object/:id", async (ctx, next) => {
if (this.alreadyRespondedTo(ctx.response)) {
return;
}
let response: Response = null;
if (req.params.object === "send") {
response = await this.sendDeleteCommand.run(req.params.id);
if (ctx.params.object === "send") {
response = await this.sendDeleteCommand.run(ctx.params.id);
} else {
response = await this.deleteCommand.run(req.params.object, req.params.id, req.query);
response = await this.deleteCommand.run(
ctx.params.object,
ctx.params.id,
ctx.request.query
);
}
this.processResponse(res, response);
this.processResponse(ctx.response, response);
await next();
});
server.listen(port, () => {
this.main.logService.info("Listening on port " + port);
});
server
.use(router.routes())
.use(router.allowedMethods())
.listen(port, () => {
this.main.logService.info("Listening on port " + port);
});
}
private processResponse(res: any, commandResponse: Response) {
private processResponse(res: koa.Response, commandResponse: Response) {
if (!commandResponse.success) {
res.statusCode = 400;
res.status = 400;
}
if (commandResponse.data instanceof FileResponse) {
res.writeHead(200, {
"Content-Type": "application/octet-stream",
"Content-Disposition": "attachment;filename=" + commandResponse.data.fileName,
"Content-Length": commandResponse.data.data.length,
});
res.end(commandResponse.data.data);
res.body = commandResponse.data.data;
res.attachment(commandResponse.data.fileName);
res.set("Content-Type", "application/octet-stream");
res.set("Content-Length", commandResponse.data.data.length.toString());
} else {
res.json(commandResponse);
res.body = commandResponse;
}
}
private alreadyRespondedTo(res: koa.Response) {
return res.body != null;
}
}

Write Preview
Loading…
Cancel
Save