test(ssh): parametrized testing of ssh key addition

tests/data/turned_on.json

@@ -32,5 +32,24 @@
         "accountId": "ID",
         "accountKey": "KEY",
         "bucket": "selfprivacy"
+    },
+    "users": [
+        {
+            "username": "user1",
+            "hashedPassword": "HASHED_PASSWORD_1",
+            "sshKeys": [
+                "ssh-rsa KEY user1@pc"
+            ]
+        },
+        {
+            "username": "user2",
+            "hashedPassword": "HASHED_PASSWORD_2",
+            "sshKeys": [
+            ]
+        },
+        {
+            "username": "user3",
+            "hashedPassword": "HASHED_PASSWORD_3"
         }
+    ]
 }

tests/test_graphql/test_ssh.py

@@ -19,6 +19,8 @@ from tests.test_graphql.common import (
 )
 from tests.test_graphql.test_users import API_USERS_INFO
 
+key_users = ["root", "tester", "user1"]
+
 
 class ProcessMock:
     """Mock subprocess.Popen"""
@@ -61,6 +63,19 @@ def no_rootkeys(generic_userdata):
     assert get_ssh_settings().rootKeys == []
 
 
+@pytest.fixture
+def no_keys(generic_userdata):
+    # this removes root and admin keys too
+
+    users = get_users()
+    for user in users:
+        for key in user.ssh_keys:
+            remove_ssh_key(user.username, key)
+    users = get_users()
+    for user in users:
+        assert user.ssh_keys == []
+
+
 @pytest.fixture
 def no_admin_key(generic_userdata, authorized_client):
     admin_keys = api_get_user_keys(authorized_client, admin_name())
@@ -370,31 +385,7 @@ def test_graphql_add_ssh_key_unauthorized(client, some_users, mock_subprocess_po
     assert_empty(response)
 
 
-def test_graphql_add_ssh_key(authorized_client, some_users, mock_subprocess_popen):
+# Unauth getting of keys is tested in test_users.py because it is a part of users interface
-    response = authorized_client.post(
-        "/graphql",
-        json={
-            "query": API_CREATE_SSH_KEY_MUTATION,
-            "variables": {
-                "sshInput": {
-                    "username": "user1",
-                    "sshKey": "ssh-rsa KEY test_key@pc",
-                },
-            },
-        },
-    )
-    assert response.status_code == 200
-    assert response.json().get("data") is not None
-
-    assert response.json()["data"]["users"]["addSshKey"]["code"] == 201
-    assert response.json()["data"]["users"]["addSshKey"]["message"] is not None
-    assert response.json()["data"]["users"]["addSshKey"]["success"] is True
-
-    assert response.json()["data"]["users"]["addSshKey"]["user"]["username"] == "user1"
-    assert response.json()["data"]["users"]["addSshKey"]["user"]["sshKeys"] == [
-        "ssh-rsa KEY user1@pc",
-        "ssh-rsa KEY test_key@pc",
-    ]
 
 
 def test_graphql_get_root_key(authorized_client, some_users):
@@ -412,16 +403,27 @@ def test_get_admin_key_when_none(authorized_client, no_admin_key):
     assert api_get_user_keys(authorized_client, admin_name()) == []
 
 
-def test_graphql_add_root_ssh_key(authorized_client, no_rootkeys):
+@pytest.mark.parametrize("user", key_users)
-    output = api_add_ssh_key(authorized_client, "root", "ssh-rsa KEY test_key@pc")
+def test_graphql_add_ssh_key_when_none(authorized_client, no_keys, user):
+    key1 = "ssh-rsa KEY test_key@pc"
+    if user == "root":
+        assert api_rootkeys(authorized_client) == []
+    else:
+        assert api_get_user_keys(authorized_client, user) == []
+
+    output = api_add_ssh_key(authorized_client, user, key1)
 
     assert output["code"] == 201
     assert output["message"] is not None
     assert output["success"] is True
 
-    assert output["user"]["username"] == "root"
+    assert output["user"]["username"] == user
-    assert output["user"]["sshKeys"] == ["ssh-rsa KEY test_key@pc"]
+    assert output["user"]["sshKeys"] == [key1]
-    assert api_rootkeys(authorized_client) == ["ssh-rsa KEY test_key@pc"]
+
+    if user == "root":
+        assert api_rootkeys(authorized_client) == [key1]
+    else:
+        assert api_get_user_keys(authorized_client, user) == [key1]
 
 
 def test_graphql_add_root_ssh_key_one_more(authorized_client, no_rootkeys):
@@ -453,33 +455,6 @@ def test_graphql_add_root_ssh_key_same(authorized_client, no_rootkeys):
     assert_errorcode(output, 409)
 
 
-def test_graphql_add_admin_key(authorized_client, some_users):
-    response = authorized_client.post(
-        "/graphql",
-        json={
-            "query": API_CREATE_SSH_KEY_MUTATION,
-            "variables": {
-                "sshInput": {
-                    "username": "tester",
-                    "sshKey": "ssh-rsa KEY test_key@pc",
-                },
-            },
-        },
-    )
-    assert response.status_code == 200
-    assert response.json().get("data") is not None
-
-    assert response.json()["data"]["users"]["addSshKey"]["code"] == 201
-    assert response.json()["data"]["users"]["addSshKey"]["message"] is not None
-    assert response.json()["data"]["users"]["addSshKey"]["success"] is True
-
-    assert response.json()["data"]["users"]["addSshKey"]["user"]["username"] == "tester"
-    assert response.json()["data"]["users"]["addSshKey"]["user"]["sshKeys"] == [
-        "ssh-rsa KEY test@pc",
-        "ssh-rsa KEY test_key@pc",
-    ]
-
-
 # TODO: multiplex for root and admin
 def test_graphql_add_bad_ssh_key(authorized_client, some_users, mock_subprocess_popen):
     response = authorized_client.post(
@@ -638,9 +613,6 @@ def test_graphql_remove_main_ssh_key(
     assert response.json()["data"]["users"]["removeSshKey"]["user"]["sshKeys"] == []
 
 
-key_users = ["root", "tester", "user1"]
-
-
 @pytest.mark.parametrize("user", key_users)
 def test_graphql_remove_nonexistent_ssh_key(authorized_client, some_users, user):
     output = api_remove_ssh_key(authorized_client, user, "ssh-rsa nonexistent")

tests/test_rest_endpoints/services/test_ssh.py

@@ -95,16 +95,6 @@ def some_users(mocker, datadir):
 ## /ssh/keys/{user} ######################################################
 
 
-def test_add_admin_key(authorized_client, ssh_on):
-    response = authorized_client.post(
-        "/services/ssh/keys/tester", json={"public_key": "ssh-rsa KEY test@pc"}
-    )
-    assert response.status_code == 201
-    assert read_json(ssh_on / "turned_on.json")["sshKeys"] == [
-        "ssh-rsa KEY test@pc",
-    ]
-
-
 def test_add_admin_key_one_more(authorized_client, root_and_admin_have_keys):
     response = authorized_client.post(
         "/services/ssh/keys/tester", json={"public_key": "ssh-rsa KEY_2 test@pc"}