Skip to content

Commit 49e644b

Browse files
authored
change: s3 and s3_external obj in minio.py for SSL use (#384)
* 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
1 parent 69bbd72 commit 49e644b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ represented by the pull requests that fixed them. Critical items to know are:
1212

1313

1414
## [master](https://github.com/singularityhub/sregistry/tree/master) (master)
15+
- add: auto set "verify" attribute of s3 and s3_external obj in minio.py for SSL use (1.1.39)
1516
- fix issues with psycopg2-binary and saml auth (1.1.38)
1617
- Pin psycopg2-binary 2.8.6 to deal with UTC errors
1718
- change formatting of the login URL to fix saml auth

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.38
1+
1.1.39

shub/apps/library/views/minio.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# https://github.com/boto/boto3/blob/develop/boto3/session.py#L185
7373
s3 = session.client(
7474
"s3",
75-
verify=False,
75+
verify=MINIO_SSL,
7676
use_ssl=MINIO_SSL,
7777
endpoint_url=MINIO_HTTP_PREFIX + MINIO_SERVER,
7878
region_name=MINIO_REGION,
@@ -83,10 +83,10 @@
8383
# https://github.com/boto/botocore/blob/master/botocore/auth.py#L846
8484
s3_external = session.client(
8585
"s3",
86+
verify=MINIO_SSL,
8687
use_ssl=MINIO_SSL,
87-
region_name=MINIO_REGION,
8888
endpoint_url=MINIO_HTTP_PREFIX + MINIO_EXTERNAL_SERVER,
89-
verify=False,
89+
region_name=MINIO_REGION,
9090
config=Config(signature_version="s3v4", s3={"addressing_style": "path"}),
9191
)
9292

0 commit comments

Comments
 (0)