Merge branch '1427-oauth-graceful-admin-scope' into 'develop'

[#1427] Graceful clearance of OAuth admin scopes for non-admin users

Closes #1427

See merge request pleroma/pleroma!2061

lib/pleroma/web/oauth/scopes.ex

@@ -79,7 +79,9 @@ defmodule Pleroma.Web.OAuth.Scopes do
     if user.is_admin || !contains_admin_scopes?(scopes) || !contains_admin_scopes?(app_scopes) do
       {:ok, scopes}
     else
-      {:error, :unsupported_scopes}
+      # Gracefully dropping admin scopes from requested scopes if user isn't an admin (not raising)
+      scopes = scopes -- OAuthScopesPlug.filter_descendants(scopes, ["admin"])
+      validate(scopes, app_scopes, user)
     end
   end
 

test/web/oauth/oauth_controller_test.exs

@@ -567,33 +567,41 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
   end
 
   describe "POST /oauth/authorize" do
-    test "redirects with oauth authorization" do
+    test "redirects with oauth authorization, " <>
-      user = insert(:user)
+           "keeping only non-admin scopes for non-admin user" do
-      app = insert(:oauth_app, scopes: ["read", "write", "follow"])
+      app = insert(:oauth_app, scopes: ["read", "write", "admin"])
       redirect_uri = OAuthController.default_redirect_uri(app)
 
-      conn =
+      non_admin = insert(:user, is_admin: false)
-        build_conn()
+      admin = insert(:user, is_admin: true)
-        |> post("/oauth/authorize", %{
-          "authorization" => %{
-            "name" => user.nickname,
-            "password" => "test",
-            "client_id" => app.client_id,
-            "redirect_uri" => redirect_uri,
-            "scope" => "read:subscope write",
-            "state" => "statepassed"
-          }
-        })
 
-      target = redirected_to(conn)
+      for {user, expected_scopes} <- %{
-      assert target =~ redirect_uri
+            non_admin => ["read:subscope", "write"],
+            admin => ["read:subscope", "write", "admin"]
+          } do
+        conn =
+          build_conn()
+          |> post("/oauth/authorize", %{
+            "authorization" => %{
+              "name" => user.nickname,
+              "password" => "test",
+              "client_id" => app.client_id,
+              "redirect_uri" => redirect_uri,
+              "scope" => "read:subscope write admin",
+              "state" => "statepassed"
+            }
+          })
 
-      query = URI.parse(target).query |> URI.query_decoder() |> Map.new()
+        target = redirected_to(conn)
+        assert target =~ redirect_uri
 
-      assert %{"state" => "statepassed", "code" => code} = query
+        query = URI.parse(target).query |> URI.query_decoder() |> Map.new()
-      auth = Repo.get_by(Authorization, token: code)
+
-      assert auth
+        assert %{"state" => "statepassed", "code" => code} = query
-      assert auth.scopes == ["read:subscope", "write"]
+        auth = Repo.get_by(Authorization, token: code)
+        assert auth
+        assert auth.scopes == expected_scopes
+      end
     end
 
     test "returns 401 for wrong credentials", %{conn: conn} do
@@ -623,31 +631,34 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
       assert result =~ "Invalid Username/Password"
     end
 
-    test "returns 401 for missing scopes", %{conn: conn} do
+    test "returns 401 for missing scopes " <>
-      user = insert(:user)
+           "(including all admin-only scopes for non-admin user)" do
-      app = insert(:oauth_app)
+      user = insert(:user, is_admin: false)
+      app = insert(:oauth_app, scopes: ["read", "write", "admin"])
       redirect_uri = OAuthController.default_redirect_uri(app)
 
-      result =
+      for scope_param <- ["", "admin:read admin:write"] do
-        conn
+        result =
-        |> post("/oauth/authorize", %{
+          build_conn()
-          "authorization" => %{
+          |> post("/oauth/authorize", %{
-            "name" => user.nickname,
+            "authorization" => %{
-            "password" => "test",
+              "name" => user.nickname,
-            "client_id" => app.client_id,
+              "password" => "test",
-            "redirect_uri" => redirect_uri,
+              "client_id" => app.client_id,
-            "state" => "statepassed",
+              "redirect_uri" => redirect_uri,
-            "scope" => ""
+              "state" => "statepassed",
-          }
+              "scope" => scope_param
-        })
+            }
-        |> html_response(:unauthorized)
+          })
+          |> html_response(:unauthorized)
 
-      # Keep the details
+        # Keep the details
-      assert result =~ app.client_id
+        assert result =~ app.client_id
-      assert result =~ redirect_uri
+        assert result =~ redirect_uri
 
-      # Error message
+        # Error message
-      assert result =~ "This action is outside the authorized scopes"
+        assert result =~ "This action is outside the authorized scopes"
+      end
     end
 
     test "returns 401 for scopes beyond app scopes hierarchy", %{conn: conn} do