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

Handle high and med vulnerabilities #14

Merged
merged 3 commits into from
Feb 29, 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
4 changes: 2 additions & 2 deletions deploy/https_nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ http {
}

# HTTPS server
limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=1r/s;
# limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=10r/s;

server {
listen 443 ssl;
Expand Down Expand Up @@ -42,7 +42,7 @@ http {
auth_basic "Username and password is required";
auth_basic_user_file /etc/nginx/.htpasswd;
proxy_pass http://webapp;
limit_req zone=ratelimit;
# limit_req zone=ratelimit;
}
}
}
2 changes: 1 addition & 1 deletion src/gprofiler-dev/postgres_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# This software and the related documents are provided as is, with no express or implied warranties, other than those that are expressly stated in the License.

psycopg2-binary==2.9.9
pydantic[email]==1.8.2
pydantic[email]==1.10.14
14 changes: 7 additions & 7 deletions src/gprofiler-dev/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# This software and the related documents are Intel copyrighted materials, and your use of them is governed by the express license under which they were provided to you ("License"). Unless the License provides otherwise, you may not use, modify, copy, publish, distribute, disclose or transmit this software or the related documents without Intel's prior written permission.
# This software and the related documents are provided as is, with no express or implied warranties, other than those that are expressly stated in the License.

boto3==1.17.24
botocore==1.20.24
terminaltables==3.1.0
requests~=2.27.0
python-json-logger==2.0.1
psutil==5.8.0
boto3==1.34.25
botocore==1.34.25
terminaltables==3.1.10
requests~=2.31.0
python-json-logger==2.0.7
psutil==5.9.8
backoff==1.10.0
monotonic==1.6
simplejson==3.17.6
simplejson==3.19.2
2 changes: 1 addition & 1 deletion src/gprofiler/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN yarn --cwd /frontend/ install
COPY gprofiler/frontend /frontend
RUN yarn build

FROM python:3.10-bullseye
FROM python:3.12-bullseye

WORKDIR /usr/src/app
EXPOSE 80
Expand Down
2 changes: 1 addition & 1 deletion src/gprofiler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Running the backend locally
### Pre-requisites
- Python 3.10 or higher is installed on your machine.
- Python 3.12 or higher is installed on your machine.
- Running `deploy/docker-compose.yml` without the webapp service - that way you will be covered with all the dependencies, like databases and other services.

Now we need to install the dependencies:
Expand Down
2 changes: 1 addition & 1 deletion src/gprofiler/frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="shortcut icon" href="/favicon.ico" />
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<link rel="manifest" href="/manifest.json" />
<link rel="manifest" href="/manifest.json" crossorigin="use-credentials"/>
<title>gProfiler</title>
</head>
<body style="background-color: #f0f2f5">
Expand Down
4 changes: 2 additions & 2 deletions src/gprofiler/frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2133,9 +2133,9 @@ find-root@^1.1.0:
resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==

"flame-chart-js@ssh://[email protected]:Granulate/gflame.git":
flame-chart-js@Granulate/flame-chart-js.git:
version "3.1.0"
resolved "ssh://git@github.com:Granulate/gflame.git#cbead371f4f88843a37e91830edcbb5a3abcf20c"
resolved "https://codeload.github.com/Granulate/flame-chart-js/tar.gz/cbead371f4f88843a37e91830edcbb5a3abcf20c"
dependencies:
color "^3.1.3"
events "^3.2.0"
Expand Down
13 changes: 7 additions & 6 deletions src/gprofiler/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
# This software and the related documents are provided as is, with no express or implied warranties, other than those that are expressly stated in the License.

gprofiler_dev[postgres]
PyYAML==6.0
jsonschema==4.6.0
cachetools==5.2.0
PyYAML==6.0.1
jsonschema==4.21.1
cachetools==5.3.2
pyhumps==3.8.0
cmp-version==3.0.0
setproctitle==1.2.3
fastapi[all]==0.78.0
gunicorn==20.1.0
setproctitle==1.3.3
fastapi==0.109.0
uvicorn==0.27.0
gunicorn==21.2.0
4 changes: 2 additions & 2 deletions src/gprofiler_flamedb_rest/common/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ require (
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion src/gprofiler_logging/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10
FROM python:3.12

WORKDIR /app
EXPOSE 80
Expand Down
12 changes: 7 additions & 5 deletions src/gprofiler_logging/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
# This software and the related documents are Intel copyrighted materials, and your use of them is governed by the express license under which they were provided to you ("License"). Unless the License provides otherwise, you may not use, modify, copy, publish, distribute, disclose or transmit this software or the related documents without Intel's prior written permission.
# This software and the related documents are provided as is, with no express or implied warranties, other than those that are expressly stated in the License.

fastapi[all]==0.99.0
aiofiles==0.5.0
python-json-logger==2.0.1
orjson==3.6.3
cachetools==4.2.4
pydantic[email]==1.10.14
fastapi==0.109.0
uvicorn==0.27.0
aiofiles==23.2.1
python-json-logger==2.0.7
orjson==3.9.15
cachetools==5.3.2
types-orjson==3.6.2
Loading