Add username (#855)

* user org_id and username for basic auth

Author: YasenT

pulp_service/pulp_service/app/authentication.py

@@ -25,7 +25,8 @@ def authenticate_header(self, request):
 class RHEntitlementCertAuthentication(JSONHeaderRemoteAuthentication):
 
     header = "HTTP_X_RH_IDENTITY"
-    jq_filter = ".identity.org_id"
+    # Combines org_id with username - returns null if either is missing
+    jq_filter = '.identity | if .org_id and .user.username then "\(.org_id):\(.user.username)" else null end'
 
     def authenticate_header(self, request):
         return "Bearer"

pulp_service/pulp_service/tests/functional/test_authentication.py

@@ -48,17 +48,17 @@ def test_authentication_with_username_and_org_id(
         assert repo is not None
 
 
-def test_authentication_with_only_org_id(
+def test_authentication_with_org_id_and_username(
     anonymous_user,
     pulpcore_bindings,
     python_bindings,
     gen_object_with_cleanup,
     cleanup_auth_headers,
 ):
-    """Test that requests with only org_id in x-rh-identity header work."""
-    only_orgid = {"identity": {"org_id": 67890}}
+    """Test that requests with org_id and username in x-rh-identity header work."""
+    user_with_orgid = {"identity": {"org_id": 67890, "user": {"username": "testuser2"}}}
     with anonymous_user:
-        header_content = json.dumps(only_orgid)
+        header_content = json.dumps(user_with_orgid)
         auth_header = b64encode(bytes(header_content, "ascii"))
 
         pulpcore_bindings.DomainsApi.api_client.default_headers["x-rh-identity"] = auth_header