Merge branch 'main' into feat-email

Author: sumedha-bhatt

.gitignore

@@ -19,6 +19,9 @@ enigma.log
 # Dependency directories
 node_modules/
 
+#Access Modules
+Access/access_modules
+
 # Folders created by Docker Compose
 mounts/
 public/

Access/admin.py

@@ -1,3 +1,7 @@
+'''
+Models to configure diplay, search and filtering for models on admin panel
+'''
+
 from django.contrib import admin
 
 from Access.models import (
@@ -14,17 +18,61 @@
 
 
 class UserAdmin(admin.ModelAdmin):
+    '''Class to describe how to display User model on admin panel'''
     ordering = ("name", "email")
     search_fields = ("name", "email")
     list_display = ("name", "email")
 
 
+class MembershipV2AdminPanel(admin.ModelAdmin):
+    '''Class to describe how to display MembershipV2 on admin panel'''
+    ordering = ("membership_id", "user__name", "group__name")
+    search_fields = ("membership_id", "user__name", "group__name")
+    list_display = ("membership_id", "user", "group")
+
+
+class AccessV2AdminPanel(admin.ModelAdmin):
+    '''Class to describe how to display AccessV2 model on admin panel'''
+    search_fields = ("access_tag", "access_label")
+    list_display = ("access_tag", "access_label")
+    sortable_by = ("access_tag",)
+
+
+class UserIdentityAdminPanel(admin.ModelAdmin):
+    '''Class to describe how to display User Identity on admin panel'''
+    search_fields = ("access_tag", "user__name", "status")
+    list_display = ("access_tag", "user", "identity", "status")
+
+
+class UserAccessMappingAdminPanel(admin.ModelAdmin):
+    '''Class to describe how to display UserAccessMapping on admin panel'''
+    search_fields = (
+        "request_id",
+        "user_identity__user__name",
+        "access__access_tag",
+        "access__access_label",
+        "status"
+    )
+    list_display = (
+        "request_id",
+        "get_user_name",
+        "access",
+        "status",
+    )
+    ordering = (
+        "request_id",
+        "user_identity__user__name",
+        "access",
+        "status"
+    )
+
+
 admin.site.register(User, UserAdmin)
 admin.site.register(Permission)
-admin.site.register(UserAccessMapping)
+admin.site.register(UserAccessMapping, UserAccessMappingAdminPanel)
 admin.site.register(Role)
-admin.site.register(AccessV2)
+admin.site.register(AccessV2, AccessV2AdminPanel)
 admin.site.register(GroupV2)
-admin.site.register(MembershipV2)
+admin.site.register(MembershipV2, MembershipV2AdminPanel)
 admin.site.register(GroupAccessMapping)
-admin.site.register(UserIdentity)
+admin.site.register(UserIdentity, UserIdentityAdminPanel)

Access/models.py

@@ -940,6 +940,9 @@ def create(
         mapping.save()
         return mapping
 
+    def get_user_name(self):
+        return self.user_identity.user.name
+
 
 class GroupAccessMapping(models.Model):
     """

config.json.sample

@@ -9,7 +9,8 @@
   "access_modules": {
     "git_urls": [
       "https://github.com/browserstack/enigma-public-access-modules.git"
-    ]
+    ],
+    "RETRY_LIMIT": 5
   },
   "enigmaGroup": {
     "MAIL_APPROVER_GROUPS": [

docker-compose.yml

@@ -56,9 +56,15 @@ services:
     - redis
     - web
     command: >
-      bash -c "
-      echo Starting celery;
-      python3 -m celery -A EnigmaAutomation worker -n worker1 -l DEBUG"
+      /bin/bash -c "
+        while ! nc -z redis 6379;
+        do 
+          echo sleeping;
+          sleep 1;
+        done;
+        echo Connected!;
+        echo Starting celery;
+        python3 -m celery -A EnigmaAutomation worker -n worker1 -l DEBUG"
   test:
     container_name: test
     build:

schema.json

@@ -69,11 +69,16 @@
     "access_modules": {
       "description": "List of access modules attached to this tool",
       "type": "object",
-      "additionalProperties": false,
+      "additionalProperties": true,
       "properties": {
         "git_urls": {
           "description": "List of git URLs of access modules",
           "type": "array"
+        },
+        "RETRY_LIMIT": {
+          "description": "Number of retries before raising cloning failure exception",
+          "type": "integer",
+          "minimum": 1
         }
       }
     },

scripts/clone_access_modules.py

@@ -1,13 +1,15 @@
 import json
 import sys
 import shutil
-from git import Repo
+from git import Repo, GitCommandError
+import time
 import os
 
 print("Starting cloning setup")
 try:
     f = open("./config.json", "r")
     config = json.load(f)
+    RETRY_LIMIT = config["access_modules"]["RETRY_LIMIT"]
     urls = config["access_modules"]["git_urls"]
 
     for each_access_module in os.listdir('Access/access_modules'):
@@ -33,10 +35,26 @@
         folder_name = url.split("/").pop()[:-4]
         folder_path = "./Access/access_modules/" + folder_name
         try:
-            if specified_branch:
-                Repo.clone_from(url, folder_path, branch=specified_branch)
-            else:
-                Repo.clone_from(url, folder_path)
+            retry_exception = None
+            for i in range(1, RETRY_LIMIT + 1):
+                try:
+                    if specified_branch:
+                        Repo.clone_from(url, folder_path, branch=specified_branch)
+                    else:
+                        Repo.clone_from(url, folder_path)
+                except (GitCommandError, Exception) as ex:
+                    print("error occurred: ", ex)
+                    print("retry:{1}/{2}".format(ex, i, RETRY_LIMIT))
+                    retry_exception = ex
+                    time.sleep(10 * i)
+                    print("retrying")
+                else:
+                    retry_exception = None
+                    break
+            if (retry_exception != None):
+                print("max retry count reached")
+                raise retry_exception
+
             # move all folders, not files in the cloned repo to the access_modules
             # folder except the .git, .github and secrets folder
             for file in os.listdir(folder_path):
@@ -52,7 +70,7 @@
                         )
                     except:
                          print("File is already present.")
-                            
+
                 if(file == "requirements.txt"):
                     current_requirements_file = folder_path + "/" + file
                     #Read the requirements
@@ -64,12 +82,12 @@
 
                     # Merge the requirements
                     merged_requirements = list(set(requirements1 + requirements2))
-                       
+
                     #update the requirements.txt
                     with open(requirements_file, 'w') as out_file:
                         for requirement in sorted(merged_requirements):
                              out_file.write(requirement)
-                       
+
             print("Cloning successful!")
         except Exception as e:
            print("error-->",e)
@@ -84,7 +102,7 @@
         except Exception as e:
             print(e)
             print("failed to remove " + folder_path + " folder.")
-        
+
 except Exception as e:
     print("Access module cloning failed!")
     print(str(e))

scripts/validator.py

@@ -25,6 +25,6 @@
     validate(instance=config, schema=schema)
     logger.info("Schema validation passed!")
 except Exception as e:
-    logger.error("Schema validation failed! Error is: " + e)
+    logger.error("Schema validation failed! Error is: %s", e)
     traceback.format_exc()
     sys.exit(1)

secrets/ops_app_celery.env

@@ -1,5 +1,5 @@
-CELERY_BROKER_URL=redis://redis:6379/0
-CELERY_RESULT_BACKEND=redis://redis:6379/0
+CELERY_BROKER_URL=redis://host.docker.internal:6379
+CELERY_RESULT_BACKEND=redis://host.docker.internal:6379
 C_FORCE_ROOT=true
 MYSQL_ROOT_PASSWORD=testtest
 MYSQL_DATABASE=enigma