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

notification: check certs exists for webhooks (PROJQUAY-2424) (#886) #900

Merged
merged 3 commits into from
Sep 22, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ jobs:
with:
repository: opencontainers/distribution-spec
path: dist-spec
ref: 7be5e8534d10ebdb6d1631a6ecc1beaa5b622f65

- name: Set up Python 3.8
uses: actions/setup-python@v1
Expand Down
5 changes: 4 additions & 1 deletion notifications/notificationmethod.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging
import os.path
import re
import json
import mock
Expand Down Expand Up @@ -37,7 +38,9 @@ class NotificationMethodPerformException(JobException):

def _ssl_cert():
if app.config["PREFERRED_URL_SCHEME"] == "https":
return [OVERRIDE_CONFIG_DIRECTORY + f for f in SSL_FILENAMES]
cert_files = [OVERRIDE_CONFIG_DIRECTORY + f for f in SSL_FILENAMES]
cert_exists = all([os.path.isfile(f) for f in cert_files])
return cert_files if cert_exists else None

return None

Expand Down
2 changes: 1 addition & 1 deletion requirements-osbs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ maxminddb==1.5.2
meld3==2.0.0
mixpanel==4.5.0
mock==3.0.5
mockldap @ git+https://github.com/quay/mockldap.git@4265554a3d89fe39bf05b18e91607bec3fcf215a
mockldap @ git+https://github.com/quay/mockldap.git@136253ca136fc7898944a4b37893a99440f7335e
monotonic==1.5
msgpack==0.6.2
msrest==0.6.19
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
git+https://github.com/quay/appr.git@58c88e4952e95935c0dd72d4a24b0c44f2249f5b#egg=cnr_server
git+https://github.com/DevTable/aniso8601-fake.git@bd7762c7dea0498706d3f57db60cd8a8af44ba90#egg=aniso8601
git+https://github.com/jarus/flask-testing.git@17f19d7fee0e1e176703fc7cb04917a77913ba1a#egg=Flask_Testing
git+https://github.com/quay/mockldap.git@4265554a3d89fe39bf05b18e91607bec3fcf215a#egg=mockldap
git+https://github.com/quay/mockldap.git@136253ca136fc7898944a4b37893a99440f7335e#egg=mockldap
git+https://github.com/quay/py-bitbucket.git@85301693ce3682f8e1244e90bd8a903181844bde#egg=py_bitbucket
git+https://github.com/DevTable/python-etcd.git@f1168cb02a2a8c83bec1108c6fcd8615ef463b14#egg=python_etcd
git+https://github.com/quay/supervisor-stdout.git@9bdf630d0d1b4a16cf8b60b96adafb1ed98e7380#egg=supervisor_stdout
Expand Down Expand Up @@ -47,7 +47,7 @@ Flask-Login==0.4.1
Flask-Mail==0.9.1
Flask-Principal==0.4.0
Flask-RESTful==0.3.7
funcparserlib==0.3.6
funcparserlib==1.0.0a0
funcsigs==1.0.2
furl==2.1.0
future==0.18.2
Expand Down