Merge pull request #140 from guzman-raphael/flush

Allow flushing privileges if admin user is available

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [0.5.6] - 2022-10-29
+
+### Added
+
+- Add option to flush user privileges if root user available using env vars: `DJ_HOST`, `DJ_ROOT_USER`, `DJ_ROOT_PASS` [#140](https://github.com/datajoint/pharus/pull/140)
+
 ## [0.5.5] - 2022-10-26
 
 ### Fixed
@@ -194,6 +200,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 - Support for DataJoint attribute types: `varchar`, `int`, `float`, `datetime`, `date`, `time`, `decimal`, `uuid`.
 - Check dependency utility to determine child table references.
 
+[0.5.6]: https://github.com/datajoint/pharus/compare/0.5.5...0.5.6
 [0.5.5]: https://github.com/datajoint/pharus/compare/0.5.4...0.5.5
 [0.5.4]: https://github.com/datajoint/pharus/compare/0.5.3...0.5.4
 [0.5.3]: https://github.com/datajoint/pharus/compare/0.5.2...0.5.3

README.rst

@@ -29,13 +29,13 @@ To start the API server, use the command:
 
     .. code-block:: bash
 
-        PHARUS_VERSION=0.5.5 docker-compose -f docker-compose-deploy.yaml up -d
+        PHARUS_VERSION=0.5.6 docker-compose -f docker-compose-deploy.yaml up -d
 
 To stop the API server, use the command:
 
     .. code-block:: bash
 
-        PHARUS_VERSION=0.5.5 docker-compose -f docker-compose-deploy.yaml down
+        PHARUS_VERSION=0.5.6 docker-compose -f docker-compose-deploy.yaml down
 
 References
 ----------

docker-compose-deploy.yaml

@@ -1,5 +1,5 @@
-# PHARUS_VERSION=0.5.5 docker-compose -f docker-compose-deploy.yaml pull
-# PHARUS_VERSION=0.5.5 docker-compose -f docker-compose-deploy.yaml up -d
+# PHARUS_VERSION=0.5.6 docker-compose -f docker-compose-deploy.yaml pull
+# PHARUS_VERSION=0.5.6 docker-compose -f docker-compose-deploy.yaml up -d
 #
 # Intended for production deployment.
 # Note: You must run both commands above for minimal outage

pharus/server.py

@@ -5,6 +5,7 @@
 from typing import Callable
 from functools import wraps
 from typing import Union
+import pymysql
 
 # Crypto libaries
 from cryptography.hazmat.primitives import serialization as crypto_serialization
@@ -117,7 +118,7 @@ def api_version() -> str:
             Content-Type: application/json
 
             {
-                "version": "0.5.5"
+                "version": "0.5.6"
             }
 
         :statuscode 200: No error.
@@ -248,7 +249,24 @@ def login() -> dict:
                 connect_creds = request.json
             if connect_creds.keys() < {"databaseAddress", "username", "password"}:
                 return dict(error="Invalid Request, check headers and/or json body")
-            _DJConnector._attempt_login(**connect_creds)
+            try:
+                _DJConnector._attempt_login(**connect_creds)
+            except pymysql.err.OperationalError as e:
+                if (
+                    (root_host := environ.get("DJ_HOST"))
+                    and (root_user := environ.get("DJ_ROOT_USER"))
+                    and (root_password := environ.get("DJ_ROOT_PASS"))
+                ):
+                    conn = dj.conn(
+                        host=root_host,
+                        user=root_user,
+                        password=root_password,
+                        reset=True,
+                    )
+                    conn.query("FLUSH PRIVILEGES")
+                    _DJConnector._attempt_login(**connect_creds)
+                else:
+                    raise e
             return dict(**auth_info)
         except Exception as e:
             return str(e), 500

pharus/version.py

@@ -1,2 +1,2 @@
 """Package metadata."""
-__version__ = "0.5.5"
+__version__ = "0.5.6"