Skip to content
Open
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: 20 additions & 0 deletions .github/workflows/pr_notify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: PR Notifier

on:
pull_request:
types: [opened, reopened, closed]

jobs:
notify:
runs-on: ubuntu-latest
steps:
- name: Notify Discord
env:
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
run: |
curl -H "Content-Type: application/json" -d '{"content": "πŸ”” Pull Request [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }}) by ${{ github.event.pull_request.user.login }} - ${{ github.event.action }}"}' $DISCORD_WEBHOOK_URL
- name: Notify Slack
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
run: |
curl -H "Content-Type: application/json" -d '{"text": ":bell: Pull Request <${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}> by ${{ github.event.pull_request.user.login }} - ${{ github.event.action }}"}' $SLACK_WEBHOOK_URL
6 changes: 3 additions & 3 deletions app/routes/contributions.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ function ContributionsHandler(db) {

/*jslint evil: true */
// Insecure use of eval() to parse inputs
const preTax = eval(req.body.preTax);
const afterTax = eval(req.body.afterTax);
const roth = eval(req.body.roth);
const preTax = parseInt(req.body.preTax);
const afterTax = parseInt(req.body.afterTax);
const roth = parseInt(req.body.roth);

/*
//Fix for A1 -1 SSJS Injection attacks - uses alternate method to eval
Expand Down
9 changes: 7 additions & 2 deletions app/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,13 @@ const index = (app, db) => {

// Handle redirect for learning resources link
app.get("/learn", isLoggedIn, (req, res) => {
// Insecure way to handle redirects by taking redirect url from query string
return res.redirect(req.query.url);
const allowedUrls = ["https://trustedsite.com", "https://anothertrustedsite.com"];
const redirectUrl = req.query.url;
if (allowedUrls.includes(redirectUrl)) {
return res.redirect(redirectUrl);
} else {
return res.status(400).send("Invalid redirect URL.");
}
});

// Research Page
Expand Down
16 changes: 6 additions & 10 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,19 @@ MongoClient.connect(db, (err, db) => {
secret: cookieSecret,
// Both mandatory in Express v4
saveUninitialized: true,
resave: true
/*
resave: true,
// Fix for A5 - Security MisConfig
// Use generic cookie name
key: "sessionId",
*/

/*
// Fix for A3 - XSS
// TODO: Add "maxAge"
cookie: {
httpOnly: true
// Remember to start an HTTPS server to get this working
// secure: true
httpOnly: true,
secure: true,
expires: new Date(Date.now() + 60 * 60 * 1000), // 1 hour
domain: 'example.com', // replace with your domain
path: '/'
}
*/

}));

/*
Expand Down