Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JWT, test endpoints, and service account. #16

Merged
merged 10 commits into from
Dec 3, 2024
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
5 changes: 5 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dockerComposeFile": "../docker-compose.yml",
"service": "spider",
"workspaceFolder": "/usr/local/bin/node"
}
10 changes: 10 additions & 0 deletions .env.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
###
# Environment variables for CI
###

AWS_ACCESS_KEY_ID=test-key-id
AWS_SECRET_ACCESS_KEY=test-access-key
S3_BUCKET_NAME=test-bucket
S3_ENDPOINT=http://minio:9000
ALLOWED_AGENCIES="hq,htcts"
JWT=test-jwt
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
# AWS_CLOUDFRONT_PUBLIC_KEY_EXPIRING: "${{ secrets.AWS_CLOUDFRONT_PUBLIC_KEY_B }}"
BASIC_AUTH_USER: ${{ secrets.BASIC_AUTH_USER }}
BASIC_AUTH_PASS: ${{ secrets.BASIC_AUTH_PASS }}
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
JWT: ${{ secrets.JWT }}
run: |
## - - - - - - - - - -
## CloudFront - - - -
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test

on: [pull_request]

jobs:
test:
if: github.event.ref != 'refs/heads/main'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Run tests
run: |
cp .env.ci .env
docker compose run --rm -e JWT=${JWT} spider sh -c "npm ci && npm run test"
env:
JWT: ${{ secrets.JWT }}
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ WORKDIR /usr/local/bin/node
COPY conf/entrypoint/start-node-prod.sh /docker-entrypoint.d/
RUN chmod -R +x /docker-entrypoint.d/start-node-prod.sh

# Install the node modules.
RUN npm ci

# Change the environment to production for runtime.
# Set the environment to production for install & runtime.
ENV NODE_ENV=production

# Install the node modules.
RUN npm ci --only=prod

# Remove the npm package manager.
RUN apt remove -y curl npm unzip

Expand Down
2 changes: 1 addition & 1 deletion conf/entrypoint/start-node-prod.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

nohup node /usr/local/bin/node/process.js &
nohup node /usr/local/bin/node/server.js &

21 changes: 21 additions & 0 deletions conf/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,27 @@ server {
proxy_pass http://localhost:2000/spider;
}

location /fetch-test {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:2000/fetch-test;
}

location /bucket-test {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:2000/bucket-test;
}

location /set-cf-cookie {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:2000/set-cf-cookie;
}

location / {
root /usr/share/nginx/html;
index index.html;
Expand Down
46 changes: 46 additions & 0 deletions conf/node/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
export const port = 2000;
export const jwt = process.env.JWT;

/**
* S3
*/

export const s3Region = 'eu-west-2';
export const s3BucketName = process.env.S3_BUCKET_NAME;
export const s3Credentials = process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY && {
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
}

/**
* Options
*/

export const corsOptions ={
methods: ["POST"],
origin: [
"http://spider.intranet.docker/",
"https://dev-intranet-archive.apps.live.cloud-platform.service.justice.gov.uk/",
],
};

/**
* Defaults
*/

export const defaultAgency = "hq";
export const defaultUrl = "https://intranet.justice.gov.uk/";

/**
* Validation
*/

export const allowedTargetHosts = [
"intranet.docker",
"intranet.justice.gov.uk",
"dev.intranet.justice.gov.uk",
"staging.intranet.justice.gov.uk",
"demo.intranet.justice.gov.uk",
];

export const allowedTargetAgencies = process.env.ALLOWED_AGENCIES?.split(",") ?? [];
33 changes: 33 additions & 0 deletions conf/node/controllers/__snapshots__/httrack.test.js.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`getHttrackArgs should return an array of arguments 1`] = `
[
"-%W",
"/archiver/strip_x_amz_query_param.so",
"https://intranet.justice.gov.uk/",
"+*.png",
"+*.gif",
"+*.jpg",
"+*.jpeg",
"+*.css",
"+*.js",
"-ad.doubleclick.net/*",
"-*intranet.justice.gov.uk/agency-switcher/",
"-*intranet.justice.gov.uk/?*agency=*",
"-*intranet.justice.gov.uk/?p=*",
"-*intranet.justice.gov.uk/?page_id=*",
"-*intranet.justice.gov.uk/wp-json/*/embed*",
"-*intranet.justice.gov.uk/wp/*",
"+*intranet.justice.gov.uk/?*agency=hq",
"-s0",
"-V",
""sed -i 's/srcset="[^"]*"//g' $0"",
"-%k",
"-F",
"intranet-archive",
"-%X",
"Cookie: dw_agency=hq; jwt=***",
"-O",
"/tmp/test-snapshot",
]
`;
33 changes: 33 additions & 0 deletions conf/node/controllers/cloudfront.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
const { getSignedCookies } = require("@aws-sdk/cloudfront-signer");

// TODO: Implement the getCookies function

const getCookies = () => {
const cloudfrontDistributionDomain = "https://d111111abcdef8.cloudfront.net";
const s3ObjectKey = "private-content/private.jpeg";
const url = `${cloudfrontDistributionDomain}/${s3ObjectKey}`;
const privateKey = "CONTENTS-OF-PRIVATE-KEY";
const keyPairId = "PUBLIC-KEY-ID-OF-CLOUDFRONT-KEY-PAIR";
const dateLessThan = "2022-01-01";

const policy = {
Statement: [
{
Resource: url,
Condition: {
DateLessThan: {
"AWS:EpochTime": new Date(dateLessThan).getTime() / 1000, // time in seconds
},
},
},
],
};

const policyString = JSON.stringify(policy);

return getSignedCookies({
keyPairId,
privateKey,
policy: policyString,
});
};
Loading
Loading