From 2b0e19454c9a29bb8b4f30cced520366df6a32cc Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Tue, 14 Feb 2023 11:00:02 +0100
Subject: [PATCH] SSDM-13278: Added raising exception to PyBIS if a second
login fails
---
.../src/python/pybis/pybis.py | 9 ++++++---
.../src/python/tests/test_openbis.py | 14 ++++++++++++++
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/api-openbis-python3-pybis/src/python/pybis/pybis.py b/api-openbis-python3-pybis/src/python/pybis/pybis.py
index f8e118db98c..81360b6c63c 100644
--- a/api-openbis-python3-pybis/src/python/pybis/pybis.py
+++ b/api-openbis-python3-pybis/src/python/pybis/pybis.py
@@ -1310,16 +1310,19 @@ class Openbis:
if password is None:
import getpass
-
password = getpass.getpass()
+ def is_different_login():
+ return username != self._get_username()
+
login_request = {
"method": "login",
"params": [username, password],
}
- self.token = self._post_request(self.as_v3, login_request)
- if self.token is None:
+ token = self._post_request(self.as_v3, login_request)
+ if token is None or (is_different_login() and token == self.token):
raise ValueError("login to openBIS failed")
+ self.token = token
if save_token:
self._save_token_to_disk()
self._password(password)
diff --git a/api-openbis-python3-pybis/src/python/tests/test_openbis.py b/api-openbis-python3-pybis/src/python/tests/test_openbis.py
index 8db5be30fbb..c61c7600355 100644
--- a/api-openbis-python3-pybis/src/python/tests/test_openbis.py
+++ b/api-openbis-python3-pybis/src/python/tests/test_openbis.py
@@ -196,3 +196,17 @@ def test_get_samples_update_in_transaction(openbis_instance):
assert sample1.parents == [sample3.identifier]
assert sample2.parents == []
assert sample3.children == [sample1.identifier]
+
+
+def test_failed_second_login_raises_exception(openbis_instance):
+ '''
+ Logins to openBIS using wrong username/password, PyBIS should raise exception
+ '''
+ assert openbis_instance.is_session_active() is True
+
+ try:
+ openbis_instance.login('non_existing_username_for_test', 'abcdef')
+ # Login should fail at this point
+ assert False
+ except ValueError as e:
+ assert str(e) == "login to openBIS failed"
--
GitLab