فهرست منبع

Oracle通过配置获取密钥

zhangdongming 1 ماه پیش
والد
کامیت
039d714516
4فایلهای تغییر یافته به همراه31 افزوده شده و 19 حذف شده
  1. 0 17
      AnsjerPush/config.py
  2. 7 0
      AnsjerPush/eur_config/eur_formal_settings.py
  3. 7 0
      AnsjerPush/us_config/formal_settings.py
  4. 17 2
      Object/OCIObjectStorage.py

+ 0 - 17
AnsjerPush/config.py

@@ -247,20 +247,3 @@ firebase_admin.initialize_app(credentials.Certificate(
     BASE_DIR + '/static/fcm/adcloud-fdf9b-firebase-adminsdk-dcvn1-d53e047cc8.json'))
 
 
-OCI_CONFIG = {
-    'us': {
-        'user': 'ocid1.user.oc1..aaaaaaaa63vtn64izdujrghlfby6xrlrrdce4yldtnjm7tmqzoc5i2b36s5q',
-        'fingerprint': '09:ff:f4:fa:64:bd:7b:72:64:67:5e:9a:ba:01:68:7b',
-        'tenancy': 'ocid1.tenancy.oc1..aaaaaaaaemreyqoegf4wbegfzetg63bwvzxa7ahfptbziexslzfmc7gnuwmq',
-        'region': 'us-phoenix-1',
-        'key_file': 'AnsjerPush/servers@ansjer.com_2023-12-20T07_21_33.069Z.pem'
-    },
-    'eur': {
-        'user': 'ocid1.user.oc1..aaaaaaaa63vtn64izdujrghlfby6xrlrrdce4yldtnjm7tmqzoc5i2b36s5q',
-        'fingerprint': '09:ff:f4:fa:64:bd:7b:72:64:67:5e:9a:ba:01:68:7b',
-        'tenancy': 'ocid1.tenancy.oc1..aaaaaaaaemreyqoegf4wbegfzetg63bwvzxa7ahfptbziexslzfmc7gnuwmq',
-        'region': 'uk-london-1',
-        'key_file': 'AnsjerPush/servers@ansjer.com_2023-12-20T07_21_33.069Z.pem'
-    }
-}
-OCI_NAMESPACE_NAME = 'cnmlmfa4fooi'

+ 7 - 0
AnsjerPush/eur_config/eur_formal_settings.py

@@ -20,6 +20,13 @@ OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
+OCI_USER = env('OCI_USER', default='')
+OCI_FINGERPRINT = env('OCI_FINGERPRINT', default='')
+OCI_TENANCY = env('OCI_TENANCY', default='')
+OCI_REGION = env('OCI_REGION', default=[])
+OCI_KEY_FILE = env('OCI_KEY_FILE', default='')
+OCI_NAMESPACE_NAME = env('OCI_NAMESPACE_NAME', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

+ 7 - 0
AnsjerPush/us_config/formal_settings.py

@@ -20,6 +20,13 @@ OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
+OCI_USER = env('OCI_USER', default='')
+OCI_FINGERPRINT = env('OCI_FINGERPRINT', default='')
+OCI_TENANCY = env('OCI_TENANCY', default='')
+OCI_REGION = env('OCI_REGION', default=[])
+OCI_KEY_FILE = env('OCI_KEY_FILE', default='')
+OCI_NAMESPACE_NAME = env('OCI_NAMESPACE_NAME', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]

+ 17 - 2
Object/OCIObjectStorage.py

@@ -9,8 +9,16 @@
 import logging
 
 import oci
+from AnsjerPush.config import CONFIG_EUR
 
-from AnsjerPush.config import OCI_CONFIG, OCI_NAMESPACE_NAME
+from django.conf import settings
+
+OCI_USER = settings.OCI_USER
+OCI_FINGERPRINT = settings.OCI_FINGERPRINT
+OCI_TENANCY = settings.OCI_TENANCY
+OCI_REGION = settings.OCI_REGION
+OCI_KEY_FILE = settings.OCI_KEY_FILE
+OCI_NAMESPACE_NAME = settings.OCI_NAMESPACE_NAME
 
 LOGGER = logging.getLogger('time')
 
@@ -24,7 +32,14 @@ class OCIObjectStorage:
 
     def __init__(self, region):
         # Initialize service client with default oci_config file
-        self.object_storage_client = oci.object_storage.ObjectStorageClient(OCI_CONFIG[region])
+        oci_config = {
+            'user': OCI_USER,
+            'fingerprint': OCI_FINGERPRINT,
+            'tenancy': OCI_TENANCY,
+            'region': OCI_REGION[1] if region == CONFIG_EUR else OCI_REGION[0],
+            'key_file': OCI_KEY_FILE
+        }
+        self.object_storage_client = oci.object_storage.ObjectStorageClient(oci_config)
 
     def create_ereauthenticated_request(self, bucket_name, name, object_name, time_expires):
         """