Add the git commit hash to the settings

.github/workflows/ci.yml

@@ -85,6 +85,10 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
 
+      # Add the Git commit hash into base.py GIT_COMMIT_HASH
+      - name: Add the Git commit hash
+        run: echo "${{ github.sha }}" >> config/settings/base.py
+
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image

colander/core/middlewares.py

@@ -4,19 +4,18 @@
 from colander.core.forms import DocumentationForm
 from colander.core.models import Case
 
-# class ActiveCaseMiddleware:
-#     def __init__(self, get_response):
-#         self.get_response = get_response
-#         # One-time configuration and initialization.
-#
-#     def __call__(self, request):
-#         response = self.get_response(request)
-#         return response
-#
-#     # def process_view(self, request, view_func, view_args, view_kwargs):
-#     #     print(view_func)
-#     #     if not request.session.get('active_case'):
-#     #         return redirect('collect_case_create_view')
+class GitCommitHashMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        return response
+
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        try:  # this attribute does not exist in dev mode
+            request.GIT_COMMIT_HASH = settings.GIT_COMMIT_HASH
+        except: pass
 
 
 class ContextualCaseMiddleware:
@@ -61,24 +60,3 @@ def contextual_case(request):
         'user_cases': user_cases,
         'cyberchef_base_url': settings.CYBERCHEF_BASE_URL,
     }
-
-
-# def active_case(request):
-#     active_case = None
-#     user_cases = []
-#     if request.user and request.user.is_authenticated:
-#         user_cases = Case.get_user_cases(request.user)
-#         request.user_cases = user_cases
-#         if 'active_case' in request.session:
-#             try:
-#                 active_case = Case.objects.get(id=request.session['active_case'])
-#                 request.active_case = active_case
-#                 request.documentation_form = DocumentationForm(initial={'documentation': active_case.documentation})
-#             except Exception:
-#                 pass
-#
-#     return {
-#         'active_case': active_case,
-#         'user_cases': user_cases,
-#         'cyberchef_base_url': settings.CYBERCHEF_BASE_URL,
-#     }

colander/templates/base.html

@@ -276,6 +276,14 @@ <h5 class="mb-1">{{ case.name }}</h5>
         >
           <i class="nf nf-fa-github"></i>
         </a>
+        <a href="https://github.com/PiRogueToolSuite/colander/commit/{{ request.GIT_COMMIT_HASH }}"
+           class="link-offset-2 link-underline-opacity-0 link-underline-opacity-0-hover"
+           alt="Git commit hash"
+           title="Git commit hash"
+           target="_blank"
+        >
+          <span class="font-monospace text-muted text-small">{{ request.GIT_COMMIT_HASH|truncatechars:7 }}</span>
+        </a>
       </div>
     </aside>
     <div id="page-content-wrapper">

config/settings/base.py

@@ -170,6 +170,7 @@
 
     # Workspace middleware
     "colander.core.middlewares.ContextualCaseMiddleware",
+    "colander.core.middlewares.GitCommitHashMiddleware",
 ]
 
 # STATIC

config/settings/local.py

@@ -86,6 +86,6 @@
 # }
 
 CYBERCHEF_FQDN = env('CYBERCHEF_FQDN', default='beta.cyberchef.defensive-lab.agency')
-THREATR_FQDN = env('THREATR_FQDN', default='beta.threatr.defensive-lab.agency')
+THREATR_FQDN = env('THREATR_FQDN', default='10.8.0.14:9000')
 CYBERCHEF_BASE_URL = env('CYBERCHEF_BASE_URL', default=f'https://{CYBERCHEF_FQDN}')
-THREATR_BASE_URL = env('THREATR_BASE_URL', default=f'https://{THREATR_FQDN}')
+THREATR_BASE_URL = env('THREATR_BASE_URL', default=f'http://{THREATR_FQDN}')