add more test for auth

test/locales/en.json

@@ -1,3 +1,5 @@
 {
-    "foo": "bar"
+    "foo": "bar",
+    "Dummy Password": "Dummy Password",
+    "Dummy Yoloswag Password": "Dummy Yoloswag Password"
 }

test/src/testauth.py

@@ -24,3 +24,11 @@ def testauth_other_profile():
 
 def testauth_subcat_other_profile():
     return "some_data_from_subcat_other_profile"
+
+
+def testauth_only_api():
+    return "some_data_from_only_api"
+
+
+def testauth_only_cli():
+    return "some_data_from_only_cli"

test/test_auth.py

@@ -1,9 +1,14 @@
 import os
+import pytest
+import json
+
+from moulinette import MoulinetteError
+from moulinette import m18n
 
 
-def login(webapi, csrf=False, profile=None, status=200):
+class TestAuthAPI:
-
+    def login(self, webapi, csrf=False, profile=None, status=200, password="default"):
-    data = {"password": "Yoloswag"}
+        data = {"password": password}
         if profile:
             data["profile"] = profile
 
@@ -14,26 +19,51 @@ def login(webapi, csrf=False, profile=None, status=200):
             headers=None if csrf else {"X-Requested-With": ""},
         )
 
-
+    def test_request_no_auth_needed(self, moulinette_webapi):
-def test_request_no_auth_needed(moulinette_webapi):
-
         assert (
             moulinette_webapi.get("/test-auth/none", status=200).text
             == '"some_data_from_none"'
         )
 
+    def test_request_no_auth_needed_subcategories(self, moulinette_webapi):
+        assert (
+            moulinette_webapi.get("/test-auth/subcat/none", status=200).text
+            == '"some_data_from_subcat_none"'
+        )
 
-def test_request_with_auth_but_not_logged(moulinette_webapi):
+    def test_request_with_auth_but_not_logged(self, moulinette_webapi):
-
         assert (
             moulinette_webapi.get("/test-auth/default", status=401).text
             == "Authentication required"
         )
 
+    def test_request_with_auth_subcategories_but_not_logged(self, moulinette_webapi):
+        assert (
+            moulinette_webapi.get("/test-auth/subcat/default", status=401).text
+            == "Authentication required"
+        )
 
-def test_login(moulinette_webapi):
+    def test_request_not_logged_only_api(self, moulinette_webapi):
+        assert (
+            moulinette_webapi.get("/test-auth/only-api", status=401).text
+            == "Authentication required"
+        )
 
-    assert login(moulinette_webapi).text == "Logged in"
+    def test_request_only_api(self, moulinette_webapi):
+        self.login(moulinette_webapi)
+        assert (
+            moulinette_webapi.get("/test-auth/only-api", status=200).text
+            == '"some_data_from_only_api"'
+        )
+
+    def test_request_not_logged_only_cli(self, moulinette_webapi):
+        assert (
+            moulinette_webapi.get("/test-auth/only-cli", status=200).text
+            == '"some_data_from_only_cli"'
+        )
+
+    def test_login(self, moulinette_webapi):
+        assert self.login(moulinette_webapi).text == "Logged in"
 
         assert "session.id" in moulinette_webapi.cookies
         assert "session.tokens" in moulinette_webapi.cookies
@@ -43,40 +73,44 @@ def test_login(moulinette_webapi):
             cache_session_default
         )
 
+    def test_login_bad_password(self, moulinette_webapi):
+        assert self.login(moulinette_webapi, password="Bad Password", status=401).text == "Invalid password"
 
-def test_login_csrf_attempt(moulinette_webapi):
+        assert "session.id" not in moulinette_webapi.cookies
+        assert "session.tokens" not in moulinette_webapi.cookies
 
+
+    def test_login_csrf_attempt(self, moulinette_webapi):
         # C.f.
         # https://security.stackexchange.com/a/58308
         # https://stackoverflow.com/a/22533680
 
-    assert "CSRF protection" in login(moulinette_webapi, csrf=True, status=403).text
+        assert "CSRF protection" in self.login(moulinette_webapi, csrf=True, status=403).text
         assert not any(c.name == "session.id" for c in moulinette_webapi.cookiejar)
         assert not any(c.name == "session.tokens" for c in moulinette_webapi.cookiejar)
 
-
+    def test_login_then_legit_request_without_cookies(self, moulinette_webapi):
-def test_login_then_legit_request_without_cookies(moulinette_webapi):
+        self.login(moulinette_webapi)
-
-    login(moulinette_webapi)
 
         moulinette_webapi.cookiejar.clear()
 
         moulinette_webapi.get("/test-auth/default", status=401)
 
-
+    def test_login_then_legit_request(self, moulinette_webapi):
-def test_login_then_legit_request(moulinette_webapi):
+        self.login(moulinette_webapi)
-
-    login(moulinette_webapi)
 
         assert (
             moulinette_webapi.get("/test-auth/default", status=200).text
             == '"some_data_from_default"'
         )
 
+        assert (
+            moulinette_webapi.get("/test-auth/subcat/default", status=200).text
+            == '"some_data_from_subcat_default"'
+        )
 
-def test_login_then_logout(moulinette_webapi):
+    def test_login_then_logout(self, moulinette_webapi):
-
+        self.login(moulinette_webapi)
-    login(moulinette_webapi)
 
         moulinette_webapi.get("/logout", status=200)
 
@@ -89,3 +123,100 @@ def test_login_then_logout(moulinette_webapi):
             moulinette_webapi.get("/test-auth/default", status=401).text
             == "Authentication required"
         )
+
+    def test_login_other_profile(self, moulinette_webapi):
+        self.login(moulinette_webapi, profile="yoloswag", password="yoloswag")
+
+        assert "session.id" in moulinette_webapi.cookies
+        assert "session.tokens" in moulinette_webapi.cookies
+
+        cache_session_default = os.environ["MOULINETTE_CACHE_DIR"] + "/session/yoloswag/"
+        assert moulinette_webapi.cookies["session.id"] + ".asc" in os.listdir(
+            cache_session_default
+        )
+
+    def test_login_wrong_profile(self, moulinette_webapi):
+        self.login(moulinette_webapi)
+
+        assert (
+            moulinette_webapi.get("/test-auth/other-profile", status=401).text
+            == "Authentication required"
+        )
+
+        moulinette_webapi.get("/logout", status=200)
+
+        self.login(moulinette_webapi, profile="yoloswag", password="yoloswag")
+
+        assert (
+            moulinette_webapi.get("/test-auth/default", status=401).text
+            == "Authentication required"
+        )
+
+
+class TestAuthCLI:
+    def test_login(self, moulinette_cli, capsys, mocker):
+        mocker.patch('getpass.getpass', return_value='default')
+        moulinette_cli.run(['testauth', 'default'], output_as="plain")
+        message = capsys.readouterr()
+
+        assert "some_data_from_default" in message.out
+
+        moulinette_cli.run(['testauth', 'default'], output_as="plain", password="default")
+        message = capsys.readouterr()
+
+        assert "some_data_from_default" in message.out
+
+    def test_login_bad_password(self, moulinette_cli, capsys, mocker):
+        with pytest.raises(MoulinetteError):
+            moulinette_cli.run(['testauth', 'default'], output_as="plain", password="Bad Password")
+
+        mocker.patch('getpass.getpass', return_value="Bad Password")
+        with pytest.raises(MoulinetteError):
+            moulinette_cli.run(['testauth', 'default'], output_as="plain")
+
+    def test_login_wrong_profile(self, moulinette_cli, mocker):
+        mocker.patch('getpass.getpass', return_value='default')
+        with pytest.raises(MoulinetteError) as exception:
+            moulinette_cli.run(['testauth', 'other-profile'], output_as="none")
+
+        translation = m18n.g("invalid_password")
+        expected_msg = translation.format()
+        assert expected_msg in str(exception)
+
+        with pytest.raises(MoulinetteError) as exception:
+            moulinette_cli.run(['testauth', 'default'], output_as="none", password="yoloswag")
+
+        expected_msg = translation.format()
+        assert expected_msg in str(exception)
+
+    def test_request_no_auth_needed(self, capsys, moulinette_cli):
+        moulinette_cli.run(['testauth', 'none'], output_as="plain")
+        message = capsys.readouterr()
+
+        assert "some_data_from_none" in message.out
+
+    def test_request_not_logged_only_api(self, capsys, moulinette_cli):
+        moulinette_cli.run(['testauth', 'only-api'], output_as="plain")
+        message = capsys.readouterr()
+
+        assert "some_data_from_only_api" in message.out
+
+    def test_request_only_cli(self, capsys, moulinette_cli, mocker):
+        mocker.patch('getpass.getpass', return_value='default')
+        moulinette_cli.run(['testauth', 'only-cli'], output_as="plain")
+
+        message = capsys.readouterr()
+
+        assert "some_data_from_only_cli" in message.out
+
+    def test_request_not_logged_only_cli(self, capsys, moulinette_cli, mocker):
+        mocker.patch('getpass.getpass')
+        with pytest.raises(MoulinetteError) as exception:
+            moulinette_cli.run(['testauth', 'only-cli'], output_as="plain")
+
+        message = capsys.readouterr()
+        assert "some_data_from_only_cli" not in message.out
+
+        translation = m18n.g("invalid_password")
+        expected_msg = translation.format()
+        assert expected_msg in str(exception)