Skip to content

Commit ca61328

Browse files
EnriqueL8EnriqueL8
authored
Merge pull request #1630 from hyperledger/fix_cve
fix: various CVEs
2 parents 9a7e17d + 82ae4ae commit ca61328

File tree

11 files changed

+60
-96
lines changed

11 files changed

+60
-96
lines changed

‎Dockerfile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ FROM $FIREFLY_BUILDER_TAG AS firefly-builder
1515
ARG BUILD_VERSION
1616
ARG GIT_REF
1717
RUN apk add make=4.4.1-r2 \
18-
gcc=13.2.1_git20231014-r0 \
19-
build-base=0.5-r3 \
20-
curl=8.11.1-r0 \
21-
git=2.43.6-r0
18+
gcc=13.2.1_git20231014-r0 \
19+
build-base=0.5-r3 \
20+
curl=8.12.1-r0 \
21+
git=2.43.6-r0
2222
WORKDIR /firefly
2323
RUN chgrp -R 0 /firefly \
24-
&& chmod -R g+rwX /firefly \
25-
&& mkdir /.cache \
26-
&& chgrp -R 0 /.cache \
27-
&& chmod -R g+rwX /.cache
24+
&& chmod -R g+rwX /firefly \
25+
&& mkdir /.cache \
26+
&& chgrp -R 0 /.cache \
27+
&& chmod -R g+rwX /.cache
2828
USER 1001
2929
ADD --chown=1001:0 go.mod go.sum ./
3030
RUN go mod download
@@ -35,10 +35,10 @@ RUN make build
3535
FROM --platform=$FABRIC_BUILDER_PLATFORM $FABRIC_BUILDER_TAG AS fabric-builder
3636
WORKDIR /firefly/smart_contracts/fabric/firefly-go
3737
RUN chgrp -R 0 /firefly \
38-
&& chmod -R g+rwX /firefly \
39-
&& mkdir /.cache \
40-
&& chgrp -R 0 /.cache \
41-
&& chmod -R g+rwX /.cache
38+
&& chmod -R g+rwX /firefly \
39+
&& mkdir /.cache \
40+
&& chgrp -R 0 /.cache \
41+
&& chmod -R g+rwX /.cache
4242
USER 1001
4343
ADD --chown=1001:0 smart_contracts/fabric/firefly-go .
4444
RUN GO111MODULE=on go mod vendor
@@ -55,10 +55,10 @@ RUN chgrp -R 0 /firefly && chmod -R g+rwX /firefly
5555
ADD --chown=1001:0 smart_contracts/ethereum/solidity_firefly/ .
5656
USER 1001
5757
RUN mkdir -p build/contracts \
58-
&& cd contracts \
59-
&& solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
60-
&& cd ../build/contracts \
61-
&& mv combined.json Firefly.json
58+
&& cd contracts \
59+
&& solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
60+
&& cd ../build/contracts \
61+
&& mv combined.json Firefly.json
6262

6363
# SBOM
6464
FROM alpine:3.19 AS sbom
@@ -74,26 +74,26 @@ FROM $BASE_TAG
7474
ARG UI_TAG
7575
ARG UI_RELEASE
7676
RUN apk add --update --no-cache \
77-
sqlite=3.44.2-r0 \
78-
postgresql16-client=16.6-r0 \
79-
curl=8.11.1-r0 \
80-
jq=1.7.1-r0
77+
sqlite=3.44.2-r0 \
78+
postgresql16-client=16.6-r0 \
79+
curl=8.12.1-r0 \
80+
jq=1.7.1-r0
8181
WORKDIR /firefly
8282
RUN chgrp -R 0 /firefly \
83-
&& chmod -R g+rwX /firefly \
84-
&& mkdir /etc/firefly \
85-
&& chgrp -R 0 /etc/firefly \
86-
&& chmod -R g+rwX /etc/firefly
83+
&& chmod -R g+rwX /firefly \
84+
&& mkdir /etc/firefly \
85+
&& chgrp -R 0 /etc/firefly \
86+
&& chmod -R g+rwX /etc/firefly
8787
RUN curl -sL "https://github.com/golang-migrate/migrate/releases/download/$(curl -sL https://api.github.com/repos/golang-migrate/migrate/releases/latest | jq -r '.name')/migrate.linux-amd64.tar.gz" | tar xz \
88-
&& chmod +x ./migrate \
89-
&& mv ./migrate /usr/bin/migrate
88+
&& chmod +x ./migrate \
89+
&& mv ./migrate /usr/bin/migrate
9090
COPY --from=firefly-builder --chown=1001:0 /firefly/firefly ./firefly
9191
COPY --from=firefly-builder --chown=1001:0 /firefly/db ./db
9292
COPY --from=solidity-builder --chown=1001:0 /firefly/solidity_firefly/build/contracts ./contracts
9393
COPY --from=fabric-builder --chown=1001:0 /firefly/smart_contracts/fabric/firefly-go/firefly_fabric.tar.gz ./contracts/firefly_fabric.tar.gz
9494
ENV UI_RELEASE=https://github.com/hyperledger/firefly-ui/releases/download/$UI_TAG/$UI_RELEASE.tgz
9595
RUN mkdir /firefly/frontend \
96-
&& curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf -
96+
&& curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf -
9797
COPY --from=sbom /sbom.spdx.json /sbom.spdx.json
9898
RUN ln -s /firefly/firefly /usr/bin/firefly
9999
USER 1001

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/golang-migrate/migrate/v4 v4.17.0
1818
github.com/gorilla/mux v1.8.1
1919
github.com/gorilla/websocket v1.5.1
20-
github.com/hyperledger/firefly-common v1.4.14
20+
github.com/hyperledger/firefly-common v1.4.15
2121
github.com/hyperledger/firefly-signer v1.1.19
2222
github.com/jarcoal/httpmock v1.2.0
2323
github.com/lib/pq v1.10.9
@@ -72,7 +72,7 @@ require (
7272
github.com/prometheus/client_model v0.5.0 // indirect
7373
github.com/prometheus/common v0.45.0 // indirect
7474
github.com/prometheus/procfs v0.12.0 // indirect
75-
github.com/rs/cors v1.11.0 // indirect
75+
github.com/rs/cors v1.11.1 // indirect
7676
github.com/sagikazarmark/locafero v0.4.0 // indirect
7777
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7878
github.com/sourcegraph/conc v0.3.0 // indirect
@@ -90,7 +90,7 @@ require (
9090
golang.org/x/sys v0.28.0 // indirect
9191
golang.org/x/term v0.27.0 // indirect
9292
golang.org/x/time v0.5.0 // indirect
93-
google.golang.org/protobuf v1.32.0 // indirect
93+
google.golang.org/protobuf v1.33.0 // indirect
9494
gopkg.in/ini.v1 v1.67.0 // indirect
9595
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9696
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
7777
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
7878
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
7979
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
80-
github.com/hyperledger/firefly-common v1.4.14 h1:G1x7jKBM2MmbGAo+Hwu/9w3F4cyGuWvYViEZGPLWlic=
81-
github.com/hyperledger/firefly-common v1.4.14/go.mod h1:tYTzTbVODv/gx0TJ3TkEb+gUieQiAbqLfj/yFNrlDV4=
80+
github.com/hyperledger/firefly-common v1.4.15 h1:dp4Mo2JQRPMbL7hoMw8T/ktvIUgematOLkXIppQtBp0=
81+
github.com/hyperledger/firefly-common v1.4.15/go.mod h1:bA7tAJxcpfQMrHN3/YycTSpyk4g2WlnDlpHx8WOUtAY=
8282
github.com/hyperledger/firefly-signer v1.1.19 h1:Gq5HqUp9/7egLrahJY9WMk4Y9dZVPIl99aSIged93HM=
8383
github.com/hyperledger/firefly-signer v1.1.19/go.mod h1:XTwaPRkAfVxk2G3PQOYHLbuvMOiBs0px/4vwXTsUtsA=
8484
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -163,8 +163,8 @@ github.com/qeesung/image2ascii v1.0.1 h1:Fe5zTnX/v/qNC3OC4P/cfASOXS501Xyw2UUcgrL
163163
github.com/qeesung/image2ascii v1.0.1/go.mod h1:kZKhyX0h2g/YXa/zdJR3JnLnJ8avHjZ3LrvEKSYyAyU=
164164
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
165165
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
166-
github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
167-
github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
166+
github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
167+
github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
168168
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
169169
github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
170170
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
@@ -278,8 +278,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
278278
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
279279
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
280280
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
281-
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
282-
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
281+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
282+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
283283
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
284284
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
285285
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎go.work.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,8 @@ github.com/hashicorp/go-memdb v1.3.3/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYi
253253
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
254254
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
255255
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
256-
github.com/hyperledger/firefly-common v1.4.14 h1:G1x7jKBM2MmbGAo+Hwu/9w3F4cyGuWvYViEZGPLWlic=
257-
github.com/hyperledger/firefly-common v1.4.14/go.mod h1:tYTzTbVODv/gx0TJ3TkEb+gUieQiAbqLfj/yFNrlDV4=
258-
github.com/hyperledger/firefly-signer v1.1.19 h1:Gq5HqUp9/7egLrahJY9WMk4Y9dZVPIl99aSIged93HM=
259-
github.com/hyperledger/firefly-signer v1.1.19/go.mod h1:XTwaPRkAfVxk2G3PQOYHLbuvMOiBs0px/4vwXTsUtsA=
256+
github.com/hyperledger/firefly-common v1.4.15 h1:dp4Mo2JQRPMbL7hoMw8T/ktvIUgematOLkXIppQtBp0=
257+
github.com/hyperledger/firefly-common v1.4.15/go.mod h1:bA7tAJxcpfQMrHN3/YycTSpyk4g2WlnDlpHx8WOUtAY=
260258
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
261259
github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
262260
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds=
@@ -303,6 +301,8 @@ github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzL
303301
github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
304302
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
305303
github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79/go.mod h1:xF/KoXmrRyahPfo5L7Szb5cAAUl53dMWBh9cMruGEZg=
304+
github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
305+
github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
306306
github.com/sagikazarmark/crypt v0.17.0/go.mod h1:SMtHTvdmsZMuY/bpZoqokSoChIrcJ/epOxZN58PbZDg=
307307
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
308308
github.com/snowflakedb/gosnowflake v1.6.19/go.mod h1:FM1+PWUdwB9udFDsXdfD58NONC0m+MlOSmQRvimobSM=
@@ -335,6 +335,8 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ
335335
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg=
336336
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k=
337337
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
338+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
339+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
338340
gopkg.in/bson.v2 v2.0.0-20171018101713-d8c8987b8862/go.mod h1:VN8wuk/3Ksp8lVZ82HHf/MI1FHOBDt5bPK9VZ8DvymM=
339341
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
340342
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=

0 commit comments

Comments
 (0)