Skip to content
This repository was archived by the owner on Aug 28, 2023. It is now read-only.

Commit 90b976a

Browse files
authored
[101981] Remove SU privileges from the DB user, update dependencies (#145)
1 parent 5b7db5a commit 90b976a

11 files changed

+27
-16
lines changed

SECURITY.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Security Policy
2+
3+
## Report a Vulnerability
4+
5+
Please report security issues or vulnerabilities to the [Intel® Security Center].
6+
7+
For more information on how Intel® works to resolve security issues, see
8+
[Vulnerability Handling Guidelines].
9+
10+
[Intel® Security Center]:https://www.intel.com/security
11+
12+
[Vulnerability Handling Guidelines]:https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html

client/e2e/commands.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"browsers": {
88
"base": "./node_modules/protractor/bin/webdriver-manager clean && ./node_modules/protractor/bin/webdriver-manager update --github_token 5fb7f923d65bd47dde62689da74cb849435c2c8a {chrome} {firefox}",
9-
"chrome": "--versions.chrome 108.0.5359.71",
9+
"chrome": "--versions.chrome 110.0.5481.77",
1010
"firefox": "--versions.gecko v0.26.0",
1111
"without:chrome": "--chrome false",
1212
"without:firefox": "--gecko false",

client/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker/dockerfiles/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,12 @@ RUN apt update && \
123123
rm -rf /var/lib/apt/lists/*
124124

125125
RUN python3 -m pip install pip==19.3.1
126+
RUN python3 -m pip install -U pip setuptools==65.5.1 wheel
126127

127128
USER postgres
128129

129130
RUN service postgresql start && \
130-
psql --command "CREATE USER ${DB_USER} WITH SUPERUSER PASSWORD '${DB_PASSWORD}';" && \
131+
psql --command "CREATE USER ${DB_USER} WITH CREATEDB PASSWORD '${DB_PASSWORD}';" && \
131132
service postgresql stop
132133

133134
USER root
@@ -217,9 +218,7 @@ WORKDIR ${WHEELS_PATH}
217218
RUN curl -O $WHEELS_LINK
218219
RUN curl -O $WHEELS_DEV_LINK
219220

220-
# Base image changed to ubuntu, we should to setup openvino
221-
RUN python3 -m pip install -U pip setuptools==65.5.1 wheel
222-
221+
# Install OpenVINO manually for Ubuntu base image
223222
RUN chown -R ${USER_NAME} ${WHEELS_PATH} && \
224223
OPENVINO_WHEEL=$(find ${WHEELS_PATH} -name "openvino-202*cp38*linux*.whl" -print -quit) && python3 -m pip install ${OPENVINO_WHEEL} && \
225224
OPENVINO_DEV_WHEEL=$(find ${WHEELS_PATH} -name "openvino_dev*.whl" -print -quit) && python3 -m pip install "${OPENVINO_DEV_WHEEL}"

docker/dockerfiles/Dockerfile_install_from_openvino_image.template

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ RUN sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
6767
rm -rf /var/lib/apt/lists/*
6868

6969
RUN python3 -m pip install pip==19.3.1
70+
RUN python3 -m pip install -U pip setuptools==65.5.1 wheel
7071

7172
# CREATE DIRECTORY FOR PUBLIC WORKBENCH ARTIFACTS
7273
RUN mkdir -m 777 -p ${WORKBENCH_PUBLIC_DIR} && chown -R ${USER_NAME} ${WORKBENCH_PUBLIC_DIR}

docker/dockerfiles/Dockerfile_opensource_image.template

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ ENV DEPENDENCIES " \
6565
rabbitmq-server \
6666
nginx \
6767
gettext-base \
68-
unzip \
6968
dpkg-dev \
7069
cmake \
7170
libpugixml-dev \
@@ -97,6 +96,7 @@ WORKDIR ${INTEL_OPENVINO_DIR}/tools
9796
ADD --chown=workbench workbench ${OPENVINO_WORKBENCH_ROOT}/
9897

9998
RUN python3 -m pip install pip==19.3.1
99+
RUN python3 -m pip install -U pip setuptools==65.5.1 wheel
100100

101101
# COPY JUPYTER USER SETTINGS
102102
COPY --chown=workbench workbench/docker/jupyter_config/user-settings ${JUPYTER_USER_SETTINGS_DIR}
@@ -105,8 +105,6 @@ RUN python3 -m pip install --no-cache-dir -r ${OPENVINO_WORKBENCH_ROOT}/requirem
105105
python3 -m pip install --no-cache-dir -r ${OPENVINO_WORKBENCH_ROOT}/requirements/requirements_jupyter.txt && \
106106
python3 -m pip install --no-cache-dir -r ${OPENVINO_WORKBENCH_ROOT}/model_analyzer/requirements.txt
107107

108-
RUN python3 -m pip install -U pip setuptools==65.5.1 wheel
109-
110108
RUN chown -R ${USER_NAME} ${WHEELS_PATH} && \
111109
OPENVINO_WHEEL=$(find ${WHEELS_PATH} -name "openvino-202*cp38*linux*.whl" -print -quit) && python3 -m pip install ${OPENVINO_WHEEL} && \
112110
OPENVINO_DEV_WHEEL=$(find ${WHEELS_PATH} -name "openvino_dev*.whl" -print -quit) && python3 -m pip install "${OPENVINO_DEV_WHEEL}"

docker/scripts/start_postgresql.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ setup_db() {
2727
# TODO: rm -E UTF8 when 53369 is resolved
2828
${POSTGRESQL_BIN_PATH}/initdb -E UTF8 -D "${WORKBENCH_POSTGRESQL_DATA_DIR}" &> ${WB_LOG_FILE}
2929
${POSTGRESQL_BIN_PATH}/pg_ctl -D "${WORKBENCH_POSTGRESQL_DATA_DIR}" -w start --log=${WB_LOG_FILE}
30-
psql -d postgres --command "CREATE USER ${DB_USER} WITH SUPERUSER PASSWORD '${DB_PASSWORD}'" --quiet &> ${WB_LOG_FILE}
30+
psql -d postgres --command "CREATE USER ${DB_USER} WITH CREATEDB PASSWORD '${DB_PASSWORD}'" --quiet &> ${WB_LOG_FILE}
3131
createdb -O "${DB_USER}" "${DB_NAME}"
3232
psql -d postgres --command "ALTER USER ${DB_USER} PASSWORD '${DB_PASSWORD}'" --quiet
3333

requirements/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ celery==5.2.2
88
cffi==1.15.0
99
chardet==4.0.0
1010
click==8.0.0
11-
cryptography==3.4.8
11+
cryptography==39.0.1
1212
git+https://github.com/openvinotoolkit/datumaro.git@develop#egg=datumaro
1313
defusedxml==0.7.1
1414
distlib==0.3.2

requirements/requirements_jupyter.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ defusedxml==0.7.1
1414
entrypoints==0.3
1515
idna==3.3
1616
ipykernel==5.1.2
17-
ipython==7.16.3
17+
ipython==8.10.0
1818
ipython-genutils==0.2.0
1919
ipywidgets==7.5.1
2020
jedi==0.17.2
@@ -44,7 +44,7 @@ parso==0.7.1
4444
pexpect==4.8.0
4545
pickleshare==0.7.5
4646
prometheus-client==0.9.0
47-
prompt-toolkit==2.0.10
47+
prompt-toolkit==3.0.30
4848
ptyprocess==0.7.0
4949
pycparser==2.21
5050
Pygments==2.8.0

requirements/requirements_snyk.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
numpy==1.22.0
2-
cryptography==3.3.2
2+
cryptography==39.0.1

tests/bom_test.py

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
r'.*CONTRIBUTING\.md$',
6666
r'.*pull_request_template\.md$',
6767
r'LICENSE$',
68+
r'SECURITY\.md$',
6869
r'third-party-programs\.txt$',
6970
r'.*\.log',
7071
r'.*requirements_dev\.txt.*',

0 commit comments

Comments
 (0)