Cgit fix

cgit_repos/cgitrepos

@@ -0,0 +1,5 @@
+enable-index-owner=0
+
+repo.url=Singularity
+repo.path=/var/git/singularity
+repo.desc=Repository containing all KDLP content and infrastructure.

container-compose.yml

@@ -38,6 +38,7 @@ services:
       additional_contexts:
         - orbit_singularity_git_dir=./.git
         - orbit_docs_source=./kdlp.underground.software
+        - orbit_repos_source=./cgit_repos
       target: orbit
       args:
         orbit_version_info: "singularity ${SINGULARITY_VERSION} ${SINGULARITY_DEPLOYMENT_STATUS} https://github.com/underground-software/singularity"

kdlp.underground.software/assets/style.css

@@ -459,3 +459,7 @@ li {
 #cgit ul.pager li::marker {
 	content: none;
 }
+
+#cgit .content > a {
+	display: none;
+}

orbit/Containerfile

@@ -32,10 +32,12 @@ RUN test -n "$orbit_version_info" || (echo 'version info is not set' && false) &
 RUN mkdir \
 	/var/git \
 	/orbit/docs \
+	/etc/cgit \
 	;
 
 COPY --from=orbit_singularity_git_dir . /var/git/singularity
 COPY --from=orbit_docs_source . /orbit/docs
+COPY --from=orbit_repos_source . /etc/cgit
 
 FROM alpine:3.19 AS orbit
 
@@ -48,6 +50,7 @@ COPY --from=build /orbit /orbit
 COPY --from=build /radius-venv /radius-venv
 COPY --from=build /var/orbit /var/orbit
 COPY --from=build /var/git /var/git
+COPY --from=build /etc/cgit /etc/cgit
 
 COPY cgitrc /etc/cgitrc
 

orbit/cgitrc

@@ -2,7 +2,7 @@
 css=/style.css
 
 # Allow http transport git clone
-enable-http-clone=1
+enable-http-clone=0
 
 # Enable caching of up to 1000 output entries
 cache-size=0
@@ -36,4 +36,4 @@ mimetype.svg=image/svg+xml
 
 virtual-root=/cgit
 
-scan-path=/var/git
+include=/etc/cgit/cgitrepos

orbit/radius.py

@@ -9,6 +9,7 @@
 import os
 import re
 import subprocess
+import sys
 from http import HTTPStatus, cookies
 from datetime import datetime, timedelta
 from urllib.parse import parse_qs, urlparse
@@ -476,14 +477,25 @@ def handle_cgit(rocket):
     cgit_env = os.environ.copy()
     cgit_env['PATH_INFO'] = rocket.path_info.removeprefix('/cgit')
     cgit_env['QUERY_STRING'] = rocket.env.get('QUERY_STRING', '')
+
+    path_array = cgit_env['PATH_INFO'].split('/')
+    if len(path_array) > 2 and path_array[2] == 'plain':
+        return rocket.raw_respond(HTTPStatus.NOT_FOUND)
+
     proc = subprocess.Popen(['/usr/share/webapps/cgit/cgit'],
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE,
                             env=cgit_env)
     so, se = proc.communicate()
-    outstring = str(so, 'UTF-8')
-    begin = outstring.index('\n\n')
-    return rocket.respond(outstring[begin+2:])
+    try:
+        outstring = str(so, 'UTF-8')
+        begin = outstring.index('\n\n')
+        return rocket.respond(outstring[begin+2:])
+    except (UnicodeDecodeError, ValueError) as ex:
+        print(f'cgit: Error {type(ex)} at path_info "{cgit_env["PATH_INFO"]}"'
+              f' and query string "{cgit_env["QUERY_STRING"]}"',
+              file=sys.stderr)
+        return rocket.raw_respond(HTTPStatus.INTERNAL_SERVER_ERROR)
 
 
 def handle_md(rocket, md_path):