Skip to content

Commit 1703bb3

Browse files
authored
Update @grpc/proto-loader dep to address protobufjs security issue (#6442)
1 parent f36d627 commit 1703bb3

File tree

10 files changed

+377
-431
lines changed

10 files changed

+377
-431
lines changed

.changeset/cyan-buses-float.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/firestore': patch
3+
'@firebase/rules-unit-testing': patch
4+
---
5+
6+
Update `@grpc/proto-loader` and `firebase-admin` dependencies to address `protobufjs` security issue.

.github/workflows/test-all.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
sudo apt-get update
2121
sudo apt-get install google-chrome-stable
2222
- uses: actions/checkout@v2
23-
- name: Set up Node (14)
23+
- name: Set up Node (16)
2424
uses: actions/setup-node@v2
2525
with:
26-
node-version: 14.x
26+
node-version: 16.x
2727
- name: Bump Node memory limit
2828
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
2929
- name: Test setup and yarn install
@@ -38,6 +38,8 @@ jobs:
3838
run: |
3939
xvfb-run yarn test:ci
4040
node scripts/print_test_logs.js
41+
env:
42+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
4143
- name: Generate coverage file
4244
run: yarn ci:coverage
4345
- name: Run coverage

.github/workflows/test-changed-misc.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
with:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
16-
- name: Set up Node (14)
16+
- name: Set up Node (16)
1717
uses: actions/setup-node@v2
1818
with:
19-
node-version: 14.x
19+
node-version: 16.x
2020
- name: install Chrome stable
2121
run: |
2222
sudo apt-get update
@@ -30,4 +30,6 @@ jobs:
3030
- name: build
3131
run: yarn build:changed misc
3232
- name: Run tests
33-
run: yarn test:changed misc
33+
run: yarn test:changed misc
34+
env:
35+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}

config/functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Cloud Functions for Firebase",
44
"dependencies": {
55
"cors": "2.8.5",
6-
"firebase-admin": "10.2.0",
6+
"firebase-admin": "11.0.0",
77
"firebase-functions": "3.21.0"
88
},
99
"private": true,

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"express": "4.18.1",
108108
"find-free-port": "2.0.0",
109109
"firebase-functions": "3.21.0",
110-
"firebase-tools": "9.23.3",
110+
"firebase-tools": "11.2.2",
111111
"glob": "7.2.0",
112112
"http-server": "14.1.0",
113113
"indexeddbshim": "8.0.0",

packages/auth-compat/demo/functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"logs": "firebase functions:log"
1010
},
1111
"dependencies": {
12-
"firebase-admin": "10.2.0",
12+
"firebase-admin": "11.0.0",
1313
"firebase-functions": "3.21.0"
1414
},
1515
"private": true

packages/auth/demo/functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"logs": "firebase functions:log"
1010
},
1111
"dependencies": {
12-
"firebase-admin": "10.2.0",
12+
"firebase-admin": "11.0.0",
1313
"firebase-functions": "3.21.0"
1414
},
1515
"private": true,

packages/firestore/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"@firebase/util": "1.6.3",
8585
"@firebase/webchannel-wrapper": "0.6.2",
8686
"@grpc/grpc-js": "^1.3.2",
87-
"@grpc/proto-loader": "^0.6.0",
87+
"@grpc/proto-loader": "^0.6.13",
8888
"node-fetch": "2.6.7",
8989
"tslib": "^2.1.0"
9090
},

packages/rules-unit-testing/functions/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
},
99
"private": true,
1010
"dependencies": {
11-
"firebase-admin": "10.2.0",
11+
"firebase-admin": "11.0.0",
1212
"firebase-functions": "3.21.0"
13+
},
14+
"engines": {
15+
"node": "16"
1316
}
1417
}

0 commit comments

Comments
 (0)