Skip to content

Commit

Permalink
Security and maintainability fixes
Browse files Browse the repository at this point in the history
Use Alpine 3.19 for fixtures container: this contains the libexpat patch and others.

Move the properties file to the name used for cloud analysis (I'd previously used the one for CI analysis).

Some minor maintainability fixes that were easy to fix.

#patch
  • Loading branch information
gregtyler committed Oct 15, 2024
1 parent bb74a5a commit fefb16d
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 8 deletions.
File renamed without changes.
4 changes: 1 addition & 3 deletions fixtures/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ COPY fixtures/package.json package.json
COPY fixtures/package-lock.json package-lock.json
RUN npm ci --ignore-scripts

FROM python:3-alpine3.17
FROM python:3-alpine3.19

WORKDIR /app

COPY fixtures/requirements.txt requirements.txt
RUN pip3 install -r requirements.txt
#patch packages with issues
RUN apk upgrade --no-cache libexpat

COPY fixtures/app.py app.py
COPY fixtures/lib lib
Expand Down
4 changes: 2 additions & 2 deletions fixtures/lib/aws_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ def __init__(self, boto3_session=boto3.Session()):
self.session = boto3_session

def get_headers(self, service = "execute-api", **request_config):
sigV4A = crt.auth.CrtS3SigV4AsymAuth(
sig_v4a = crt.auth.CrtS3SigV4AsymAuth(
self.session.get_credentials(),
service,
os.environ.get("AWS_REGION", "eu-west-1"),
)
aws_req = awsrequest.AWSRequest(**request_config)
sigV4A.add_auth(aws_req)
sig_v4a.add_auth(aws_req)
prepped = aws_req.prepare()

return prepped.headers
2 changes: 0 additions & 2 deletions fixtures/static/js/uid-generator.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ export class UidGenerator {

$parent.insertBefore($container, $module);
$container.appendChild($module);

$parent = $container;
}

const $btn = document.createElement("button");
Expand Down
2 changes: 1 addition & 1 deletion lambda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COPY ./internal /app/internal
ARG DIR
COPY ./lambda/$DIR /app/lambda/$DIR

RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -o /go/bin/main ./lambda/$DIR
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -o /go/bin/main "./lambda/$DIR"

FROM alpine:3

Expand Down

0 comments on commit fefb16d

Please sign in to comment.