Merge pull request #251 from RockefellerArchiveCenter/development

Add API authentication

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   scorpio-db:
     image: postgres:14.4
@@ -26,7 +24,7 @@ services:
       - scorpio-db
 
   elasticsearch:
-    image: elasticsearch:7.9.3
+    image: elasticsearch:7.17.25
     environment:
       - node.name=elasticsearch
       - discovery.seed_hosts=elasticsearch

indexer/indexers.py

@@ -40,9 +40,10 @@ class Indexer:
     """
 
     def __init__(self):
-        self.connection = connections.create_connection(
-            hosts=settings.ELASTICSEARCH['default']['hosts'], timeout=60
-        )
+        connection_args = {'hosts': settings.ELASTICSEARCH['default']['hosts'], 'timeout': 60}
+        if settings.ELASTICSEARCH['default'].get('api_key'):
+            connection_args['api_key'] = settings.ELASTICSEARCH['default']['api_key']
+        self.connection = connections.create_connection(**connection_args)
         if not Index(settings.ELASTICSEARCH['default']['index']).exists():
             BaseDescriptionComponent.init()
         self.pisces_client = ElectronBond(baseurl=settings.PISCES['baseurl'])

scorpio/config.py.deploy

@@ -11,5 +11,6 @@ SQL_HOST = "${SQL_HOST}"
 SQL_PORT = ${SQL_PORT}
 ELASTICSEARCH_HOSTS = ${ELASTICSEARCH_HOSTS}
 ELASTICSEARCH_INDEX = "${ELASTICSEARCH_INDEX}"
+ELASTICSEARCH_API_KEY = "${ELASTICSEARCH_API_KEY}"
 PISCES_BASEURL = "${PISCES_BASEURL}"
 PISCES_POST_INDEX_PATH = "${PISCES_POST_INDEX_PATH}"

scorpio/config.py.example

@@ -10,6 +10,7 @@ SQL_HOST = "scorpio-db"  # host for the application database (string)
 SQL_PORT = 5432  # port on which the application database can be reached (integer)
 ELASTICSEARCH_HOSTS = ["elasticsearch:9200"]  # hostnames (including ports, if applicable) at which Elasticsearch is available (list of strings)
 ELASTICSEARCH_INDEX = "default"  # name of Elasticsearch index to target (string)
+ELASTICSEARCH_API_KEY = None # String of encoded API Key provided by Elasticsearch. Use None if not authenticating
 MAX_OBJECTS = 1000  # maximum number of objects to be indexed at once (integer)
 PISCES_BASEURL = "http://pisces-web:8007/"  # base URL for an instance of Pisces (string)
 PISCES_POST_INDEX_PATH = "/index-complete/"  # path in Pisces which handles HTTP requests to indicate objects have been updated, default "/index-complete/" (string)

scorpio/settings.py

@@ -159,7 +159,8 @@
 ELASTICSEARCH = {
     'default': {
         'hosts': config.ELASTICSEARCH_HOSTS,
-        'index': config.ELASTICSEARCH_INDEX
+        'index': config.ELASTICSEARCH_INDEX,
+        'api_key': getattr(config, 'ELASTICSEARCH_API_KEY', None)
     },
 }