Skip to content

Commit

Permalink
fix(security): Replaced node-gettext with @postalsys/gettext
Browse files Browse the repository at this point in the history
  • Loading branch information
andris9 committed Sep 19, 2024
1 parent adbc3e5 commit a13378a
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 164 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4

- name: Install SSH key
uses: shimataro/ssh-key-action@v2.7.0
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
known_hosts: ${{ secrets.KNOWN_HOSTS }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docker-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,35 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.2.0
uses: docker/setup-qemu-action@v3
with:
platforms: 'arm64,arm'

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3
with:
platforms: linux/arm64,linux/amd64,linux/arm/v7

- name: Login to Docker Hub
uses: docker/login-action@v3.3.0
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GHCR
uses: docker/login-action@v3.3.0
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v5.5.1
uses: docker/metadata-action@v5
with:
images: |
${{ github.repository }}
Expand All @@ -45,7 +45,7 @@ jobs:
type=raw,value=latest,enable=true
- name: Build and push
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6
with:
context: .
platforms: ${{ steps.buildx.outputs.platforms }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
patch: ${{ steps.release.outputs.patch }}
release_created: ${{ steps.release.outputs.release_created }}
steps:
- uses: googleapis/release-please-action@v4.1.3
- uses: googleapis/release-please-action@v4
id: release
with:
release-type: node

# The logic below handles the npm publication:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4
# these if statements ensure that a publication only occurs when
# a new release is created:
if: ${{ steps.release.outputs.release_created }}
- uses: actions/setup-node@v4.0.3
- uses: actions/setup-node@v4
with:
node-version: 20
registry-url: 'https://registry.npmjs.org'
Expand All @@ -43,34 +43,34 @@ jobs:
steps:
- run: echo version v${{needs.release_please.outputs.major}}.${{needs.release_please.outputs.minor}}.${{needs.release_please.outputs.patch}}

- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.2.0
uses: docker/setup-qemu-action@v3
with:
platforms: 'arm64,arm'

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3
with:
platforms: linux/arm64,linux/amd64,linux/arm/v7

- name: Login to DockerHub
uses: docker/login-action@v3.3.0
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GHCR
uses: docker/login-action@v3.3.0
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6
with:
context: .
platforms: ${{ steps.buildx.outputs.platforms }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
ports:
- 6379:6379
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- run: npm install
Expand Down
2 changes: 1 addition & 1 deletion data/google-crawlers.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"creationTime": "2024-08-20T22:00:26.000000",
"creationTime": "2024-09-17T14:46:09.000000",
"prefixes": [
{
"ipv6Prefix": "2001:4860:4801:2008::/64"
Expand Down
2 changes: 1 addition & 1 deletion lib/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const fs = require('fs').promises;
const Path = require('path');
const Gettext = require('node-gettext');
const Gettext = require('@postalsys/gettext');
const { mo } = require('gettext-parser');
const locales = require('../translations/locales.json');
const joiMessages = require('@postalsys/joi-messages');
Expand Down
Loading

0 comments on commit a13378a

Please sign in to comment.