Skip to content

Commit

Permalink
change: s3 and s3_external obj in minio.py for SSL use (#384)
Browse files Browse the repository at this point in the history
* Set attributes correctly for SSL use

The 'verify' attribute is now correctly set to True or False, accordingly to the MINIO_SSL variable which determines if SSL is used in the setup.

* Updatet s3 and s3_external obj in minio.py for SSL use (#380)

add: auto set "verify" attribute of s3 and s3_external obj in minio.py for SSL use (1.1.39). See #380 for more info
  • Loading branch information
hashkeks authored Nov 11, 2021
1 parent 69bbd72 commit 49e644b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ represented by the pull requests that fixed them. Critical items to know are:


## [master](https://github.com/singularityhub/sregistry/tree/master) (master)
- add: auto set "verify" attribute of s3 and s3_external obj in minio.py for SSL use (1.1.39)
- fix issues with psycopg2-binary and saml auth (1.1.38)
- Pin psycopg2-binary 2.8.6 to deal with UTC errors
- change formatting of the login URL to fix saml auth
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.38
1.1.39
6 changes: 3 additions & 3 deletions shub/apps/library/views/minio.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
# https://github.com/boto/boto3/blob/develop/boto3/session.py#L185
s3 = session.client(
"s3",
verify=False,
verify=MINIO_SSL,
use_ssl=MINIO_SSL,
endpoint_url=MINIO_HTTP_PREFIX + MINIO_SERVER,
region_name=MINIO_REGION,
Expand All @@ -83,10 +83,10 @@
# https://github.com/boto/botocore/blob/master/botocore/auth.py#L846
s3_external = session.client(
"s3",
verify=MINIO_SSL,
use_ssl=MINIO_SSL,
region_name=MINIO_REGION,
endpoint_url=MINIO_HTTP_PREFIX + MINIO_EXTERNAL_SERVER,
verify=False,
region_name=MINIO_REGION,
config=Config(signature_version="s3v4", s3={"addressing_style": "path"}),
)

Expand Down

0 comments on commit 49e644b

Please sign in to comment.