Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Handle multiple repo in db. #16

Merged
merged 1 commit into from
Mar 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions routes/middlewares/SecurityChecker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/
'use strict';
const crypto = require('crypto');
const _ = require('lodash');
const logger = require('../../utils/logger');
const Project = require('../../models').Project;
const dbHelper = require('../../utils/db-helper');
Expand All @@ -17,17 +18,24 @@ module.exports = (provider) => async (req, res, next) => {
let isValid = false;
const params = req.body;
if (provider === 'github') {
const projectDetail = await dbHelper.scanOne(Project, {
const projectDetails = await dbHelper.scan(Project, {
repoUrl: params.repository.html_url
});

const hash = crypto.createHmac('sha1', projectDetail.secretWebhookKey).update(req.rawBody).digest('hex');
isValid = `sha1=${hash}` === req.header('X-Hub-Signature');
_.forEach(projectDetails, (projectDetail) => {
const hash = crypto.createHmac('sha1', projectDetail.secretWebhookKey).update(req.rawBody).digest('hex');
if (`sha1=${hash}` === req.header('X-Hub-Signature')) {
isValid = true;
}
});
} else if (provider === 'gitlab') {
const projectDetail = await dbHelper.scanOne(Project, {
const projectDetails = await dbHelper.scan(Project, {
repoUrl: params.project.web_url
});
isValid = projectDetail.secretWebhookKey === req.header('X-Gitlab-Token');
_.forEach(projectDetails, (projectDetail) => { // eslint-disable-line lodash/prefer-filter
if (projectDetail.secretWebhookKey === req.header('X-Gitlab-Token')) {
isValid = true;
}
});
} else {
// unknown provider
return next();
Expand Down
4 changes: 2 additions & 2 deletions utils/db-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
async function scan(model, scanParams) {
return await new Promise((resolve, reject) => {
model.scan(scanParams).exec((err, result) => {
model.scan(scanParams).consistent().all().exec((err, result) => {
if (err) {
reject(err);
}
Expand All @@ -34,7 +34,7 @@ async function scan(model, scanParams) {
*/
async function scanOne(model, scanParams) {
return await new Promise((resolve, reject) => {
model.scan(scanParams).exec((err, result) => {
model.scan(scanParams).consistent().all().exec((err, result) => {
if (err) {
reject(err);
}
Expand Down