Add test for person inbox and outbox

check activitypub content-type
Fix create activity response
test webfinger
Fix review, note voting

Signed-off-by: ziadhany <ziadhany2016@gmail.com>

Author: ziadhany

purl_sync/private.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHbwdd0Yj6pc6f
+IcMqXlQrtdi8CRQ2ixDqJK7wGS26Nj2Y/vVpXX68RTxZnM/UA/n3TYyinjQTsSkj
+557uGh4TcF+SCwVW77qdv4molAuKs7zwzkSetQl4XgxoSR5LuvJSusBYz1gtKr/z
+4tkME4YTo26P2kTjGXz9Jv58jtSBwIKkn12QJeCIEpmIpH++YUbfceO40bkrgCMP
+OoOyxuf0Q+aQoWfyuZC36EFFfegy00T0OSE3Z31v0NE7oMblM3d+FUG0y6vYaksn
+5q+XK+MI7+mqTrCx1r3sav2FitjPjxSW0tsg71SEs/j1Kv02GZLEovZFNO9+8NEm
+JBFKgJMbAgMBAAECggEAUKCvIjtlvSvOiqBMNnNXZSqKGo8zGFAFwRuejBwp1Ag8
+w/+DuRre83+sQ/B1R1pqMxSroE0EcdekccshAlMVyLccND93Y6vczwzSOxDLT8KV
+xuclb+JyFzMyofC5qlVExbSRsfX1yKDpZNDX/h1gjcz7lHXidsvlr7UVmsbl3CR/
+r9cJfRSCic8iR8rjB7yagswqw45wrMOdTK1yBCnIYIel4aXQHA7iIq8OPOujjoEl
+FPnVCm/Irj13dcGlRUDNrz15+f/bxScLDlYrEQ9FnwQb6lAb7PRnAbht89V5Xy8j
+/QH0S5ZgyIrG4iG6EdVa5IuUxtkuS4wCMOO1njwZcQKBgQDHjfSFF/lmdct0Cmsk
+LqG+B2994u0/KfVNDWR4xEvykC/tSVBUe2ZHGRH71ooEgvMI21ECWJTvqNvPb+Dv
+UfzbqLnGaosfCPrCGliQL+RW0LU+Uvrc7HklFdd3bWVRgxIltJrnhYMzxGXndc69
+Ms5/azzB0b+6SY8NrEkNXIXEUQKBgQD/2FNro+FAhrLgiTQM0xTcvXObaMSG4i5z
+s/ZzusalRTyTC/dD3UnnZU63/Iz+dEnOU3CnhwLLjk6mN5YNuNOrlkDOuMhLQN6c
+3HrHvhlfBxENAqiw9oIf6XnNRZjxtH6kQzEkSysAmgJLcQaTMoqQATRf74OEEpJQ
+G49d01ghqwKBgF9W2/8GgDpKhwSOwbeMq+vNQ6AiXfTyh+bjQiBMsHhYGP3GLCHg
+vvGy8ZufWVtkcNbHaYG0bpu90h7eNdpBEoyjpPY+Cu+t65f23F8u8mnj1uPK413P
+gOWN9N5zHpf+BhqLmgKJEDEYYRNffoF4F55azrFPE8ndwQHoURKYJLSxAoGBAJj2
+rpGJrrAUmLgUcBFG1o9PmeIN1opKirlUnIH+5quDZL8KBXEGyhvV/yWTknzD7Ci2
+zIDtAKfRUoagb0+O9Mb/E4pFAkOz6iTg0WvA5YxiPjiIIXGEQLJxtggbl2DTqG/v
+WF85reEzMzIFxoeVTTDh931wRzJcpCvO/n17UZL3AoGAXpvbfA9a+SuYLQkJ+4aW
+uwTcmg3aAO1s3r9OzUJw1O8KgDoIDpKo/pk5I8dkToqlggCBjJJMalCCY6nve7Ox
+9vGRIpgKYD0VdV7F92SIGT0cHOo8mHw2lFt4wW/R8/HCZ2zlnWQG+UYaNkWOyNRf
+1tU9T4shRLVpT/WlnCqddqQ=
+-----END PRIVATE KEY-----

purl_sync/public.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx28HXdGI+qXOnyHDKl5U
+K7XYvAkUNosQ6iSu8BktujY9mP71aV1+vEU8WZzP1AP5902Mop40E7EpI+ee7hoe
+E3BfkgsFVu+6nb+JqJQLirO88M5EnrUJeF4MaEkeS7ryUrrAWM9YLSq/8+LZDBOG
+E6Nuj9pE4xl8/Sb+fI7UgcCCpJ9dkCXgiBKZiKR/vmFG33HjuNG5K4AjDzqDssbn
+9EPmkKFn8rmQt+hBRX3oMtNE9DkhN2d9b9DRO6DG5TN3fhVBtMur2GpLJ+avlyvj
+CO/pqk6wsda97Gr9hYrYz48UltLbIO9UhLP49Sr9NhmSxKL2RTTvfvDRJiQRSoCT
+GwIDAQAB
+-----END PUBLIC KEY-----

purl_sync/purl_sync/urls.py

@@ -19,22 +19,25 @@
 from review.views import FollowView
 from review.views import HomeView
 from review.views import NoteView
-from review.views import PersonInbox
-from review.views import PersonOutbox
 from review.views import PersonSignUp
 from review.views import PersonView
 from review.views import PurlFollowers
 from review.views import PurlInbox
+from review.views import PurlListView
 from review.views import PurlOutbox
+from review.views import PurlProfile
 from review.views import PurlView
 from review.views import RepositoryListView
 from review.views import ReviewListView
 from review.views import ReviewView
 from review.views import UserFollowing
+from review.views import UserInbox
 from review.views import UserLogin
+from review.views import UserOutbox
+from review.views import UserProfile
 from review.views import WebfingerView
-from review.views import comment_vote
 from review.views import fetch_repository_file
+from review.views import note_vote
 from review.views import redirect_repository
 from review.views import redirect_vulnerability
 from review.views import review_vote
@@ -51,6 +54,7 @@
     path("accounts/logout", LogoutView.as_view(next_page="login"), name="logout"),
     path("create-repo", CreatGitView.as_view(), name="repo-create"),
     path("repo-list", RepositoryListView.as_view(), name="repo-list"),
+    path("purl-list", PurlListView.as_view(), name="purl-list"),
     path(
         "repository/<uuid:repository_id>/create-review/",
         CreateReview.as_view(),
@@ -59,15 +63,17 @@
     path("review-list", ReviewListView.as_view(), name="review-list"),
     path("reviews/<uuid:review_id>/", ReviewView.as_view(), name="review-page"),
     path("reviews/<uuid:review_id>/votes/", review_vote, name="review-votes"),
-    path("notes/<uuid:note_id>/votes/", comment_vote, name="comment-votes"),
+    path("notes/<uuid:note_id>/votes/", note_vote, name="comment-votes"),
     path("repository/<uuid:repository_id>/", redirect_repository, name="repository-page"),
     path("repository/<uuid:repository_id>/fetch", fetch_repository_file, name="repository-fetch"),
     path(
         "vulnerability/<uuid:vulnerability_id>/", redirect_vulnerability, name="vulnerability-page"
     ),
     path("notes/<uuid:uuid>", NoteView.as_view(), name="note-page"),
-    path("api/v0/users/@<str:username>/inbox", PersonInbox.as_view(), name="user-inbox"),
-    path("api/v0/users/@<str:username>/outbox", PersonOutbox.as_view(), name="user-outbox"),
+    path("api/v0/users/@<str:username>", UserProfile.as_view(), name="user-ap-profile"),
+    path("api/v0/purls/@<path:purl_string>/", PurlProfile.as_view(), name="purl-ap-profile"),
+    path("api/v0/users/@<str:username>/inbox", UserInbox.as_view(), name="user-inbox"),
+    path("api/v0/users/@<str:username>/outbox", UserOutbox.as_view(), name="user-outbox"),
     path("api/v0/purls/@<path:purl_string>/inbox", PurlInbox.as_view(), name="purl-inbox"),
     path("api/v0/purls/@<path:purl_string>/outbox", PurlOutbox.as_view(), name="purl-outbox"),
     path("api/v0/users/@<str:username>/following/", UserFollowing.as_view(), name="user-following"),
@@ -82,6 +88,5 @@
     path("o/", include("oauth2_provider.urls", namespace="oauth2_provider")),
 ]
 
-
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

purl_sync/review/activitypub.py

@@ -45,7 +45,7 @@
     "Vulnerability": Vulnerability,
 }
 
-VALID_HEADERS = [
+AP_VALID_HEADERS = [
     'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
     "application/activity+json",
 ]
@@ -57,7 +57,7 @@
 AP_TARGET = {"cc": "https://www.w3.org/ns/activitystreams#Public"}
 
 
-def check_ap_context(request):
+def check_and_r_ap_context(request):
     """
     check activitypub context request and return request without @context
     """
@@ -73,7 +73,7 @@ def add_ap_target(response):
     Add target activitypub response
     """
     if response is not dict:
-        raise Exception("Invalid response")
+        raise KeyError("Invalid response")
 
     if not response.get("cc"):
         response.append(**AP_TARGET)
@@ -83,15 +83,15 @@ def add_ap_target(response):
 
 def has_valid_header(view):
     """
-    check if the request header in the VALID_HEADERS if yes return view else return HttpResponseForbidden
+    check if the request header in the AP_VALID_HEADERS if yes return view else return HttpResponseForbidden
     """
 
     def wrapper(request, *args, **kwargs):
         content_type = request.headers.get("Content-Type")
-        if content_type in VALID_HEADERS:
+        if content_type in AP_VALID_HEADERS:
             return view(request, *args, **kwargs)
         else:
-            return HttpResponseForbidden()
+            return
 
     return wrapper
 
@@ -135,10 +135,10 @@ def get_by_type(self):
 
     def get(self):
         obj_id, page_name = full_resolve(self.id)
-        if page_name == "purl-profile":
-            return Purl.objects.get(string=obj_id["slug"])
-        elif page_name == "user-profile":
-            user = User.objects.get(username=obj_id["slug"])
+        if page_name == "purl-ap-profile":
+            return Purl.objects.get(string=obj_id["purl_string"])
+        elif page_name == "user-ap-profile":
+            user = User.objects.get(username=obj_id["username"])
             if hasattr(user, "person"):
                 return user.person
             elif hasattr(user, "service"):
@@ -166,8 +166,8 @@ class ApObject:
     published: str = None
 
     URL_MAPPER = {
-        "user-profile": "slug",
-        "purl-profile": "slug",
+        "user-ap-profile": "username",
+        "purl-ap-profile": "purl_string",
         "review-page": "uuid",
         "repository-page": "uuid",
         "note-page": "uuid",
@@ -194,7 +194,7 @@ def save(self):
             return self.failed_ap_rs()
         obj_id, page_name = full_resolve(self.object.id)
         if type(actor) is Person:
-            purl = Purl.objects.get(string=obj_id["slug"])
+            purl = Purl.objects.get(string=obj_id["purl_string"])
             new_obj, created = Follow.objects.get_or_create(person_id=actor.id, purl=purl)
         else:
             return self.failed_ap_rs()
@@ -270,7 +270,15 @@ def save(self):
 
     def succeeded_ap_rs(self, new_obj):
         """Response for successfully deleting the object"""
-        return JsonResponse({"Location": new_obj.to_ap}, status=201)
+        Obj_Map = {
+            "Note": "note-page",
+            "Review": "review-page",
+            "Repository": "repository-page",
+            "Vulnerability": "vulnerability-page",
+        }
+        return JsonResponse(
+            {"Location": full_reverse(Obj_Map[self.object.type], new_obj.id)}, status=201
+        )
 
     def failed_ap_rs(self):
         """Response for failure deleting the object"""
@@ -362,7 +370,7 @@ def failed_ap_rs(self):
 def create_activity_obj(data):
     """Convert json object to activity object"""
     payload = json.loads(data)
-    payload_without_context = check_ap_context(payload)
+    payload_without_context = check_and_r_ap_context(payload)
     return Activity(**payload_without_context)
 
 
@@ -378,7 +386,7 @@ def save(self):
             return self.failed_ap_rs()
         else:
             obj_id, page_name = full_resolve(self.object.id)
-            purl = Purl.objects.get(string=obj_id["slug"])
+            purl = Purl.objects.get(string=obj_id["purl_string"])
             follow_obj = Follow.objects.get(person_id=actor.id, purl=purl)
             follow_obj.delete()
             return self.succeeded_ap_rs()