feat: managed no-interactive-login message

Author: bctnry

COUNT

@@ -1 +1 @@
-v0.1.6-alpha,151
+v0.1.6-alpha,157

cmd/gitus/main.go

@@ -208,6 +208,9 @@ func main() {
 			}
 			HandleSSHLogin(&context, mainCall[1], mainCall[2])
 			return
+		case "no-login":
+			fmt.Println(context.Config.NoInteractiveShellMessage)
+			return
 		case "simple-mode":
 			if len(mainCall) < 3 {
 				fmt.Print(gitlib.ToPktLine("Error format for `gitus simple-mode`."))

cmd/gitus/webinstaller.go

@@ -266,6 +266,7 @@ func bindAllWebInstallerRoutes(ctx *WebInstallerRoutingContext) {
 		} else {
 			next = "/step8"
 		}
+		ctx.Config.NoInteractiveShellMessage = strings.TrimSpace(r.Form.Get("no-interactive-shell-message"))
 		err = templates.UnpackStaticFileTo(ctx.Config.StaticAssetDirectory)
 		if err != nil {
 			ctx.reportRedirect(next, 0, "Failed", fmt.Sprintf("Static file unpack is unsuccessful due to reason: %s. You can still move forward but would have to unpack static file yourself.", err.Error()), w)
@@ -542,6 +543,7 @@ func bindAllWebInstallerRoutes(ctx *WebInstallerRoutingContext) {
 					return false
 				}
 			}
+			
 			err = os.MkdirAll(ctx.Config.GitRoot, os.ModeDir|0755)
 			if errors.Is(err, os.ErrExist) {
 				err = os.Chown(ctx.Config.GitRoot, uid, gid)
@@ -566,6 +568,22 @@ func bindAllWebInstallerRoutes(ctx *WebInstallerRoutingContext) {
 			if err != nil {
 				fmt.Fprintf(w, "<p>Failed to change config file owner: %s. You should do this after the installation process has completed</p>", err)
 			}
+			
+			noInteractiveLoginPath := path.Join(homePath, "git-shell-commands", "no-interactive-login")
+			f, err := os.OpenFile(noInteractiveLoginPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0754)
+			if err != nil {
+				fmt.Fprintf(w, "<p>Failed to write <code>no-interactive-login</code>: %s; interactive shell would still be available. If this is undesirable, you'll have to add it yourself.</p>", err.Error())
+			} else {
+				defer f.Close()
+				fmt.Fprintf(f, `#!/bin/sh
+
+%s -config "%s" no-login
+`, path.Join(homePath, "git-shell-commands", "gitus"),
+					shellparse.Quote(ctx.Config.FilePath),
+				)
+				os.Chown(noInteractiveLoginPath, uid, gid)
+				fmt.Fprint(w, "<p><code>no-interactive-login</code> file has been written successfully.</p>")
+			}
 			return true
 		}() { goto leave }
 

pkg/gitus/config.go

@@ -164,6 +164,10 @@ type GitusConfig struct {
 	// could be more in the future.
 	Theme GitusThemeConfig `json:"theme"`
 
+	// "no-interactive-shell" message.
+	// the message that would get displayed when people try to log in w/
+	// a configured ssh public key.
+	NoInteractiveShellMessage string `json:"noSshLoginMessage"`
 }
 
 const (
@@ -450,6 +454,7 @@ func CreateConfigFile(p string) error {
 			ForegroundColor: "black",
 			BackgroundColor: "white",
 		},
+		NoInteractiveShellMessage: "Direct shell access is forbidden on this host.",
 	}, "", "    ")
 	if err != nil { return err }
 	f.Write(marshalRes)

routes/controller/admin/site-config.go

@@ -92,6 +92,7 @@ func bindAdminSiteConfigController(ctx *RouterContext) {
 				rc.Config.GitUser = r.Form.Get("git-user")
 				rc.Config.GitConfig.HTTPCloneProtocol.V1Dumb = len(strings.TrimSpace(r.Form.Get("git-http-enable-v1dumb"))) > 0
 				rc.Config.GitConfig.HTTPCloneProtocol.V2 = len(strings.TrimSpace(r.Form.Get("git-http-enable-v2"))) > 0
+				rc.Config.NoInteractiveShellMessage = strings.TrimSpace(r.Form.Get("no-interactive-shell-message"))
 				err := rc.Config.Sync()
 				if err != nil {
 					LogTemplateError(rc.LoadTemplate("admin/site-config").Execute(w, &templates.AdminConfigTemplateModel{

templates/admin/site-config.template.html

@@ -76,6 +76,10 @@ <h1 class="header-name" style="margin-bottom: 0">Admin</h1>
 				<td><label class="field-label" for="chk-http-enable-v2">Enable v2 protocol for HTTP clone</label></td>
 				<td><input type="checkbox" id="chk-http-enable-v2" name="git-http-enable-v2" class="field-checkbox" {{if .Config.GitConfig.HTTPCloneProtocol.V2}}checked{{end}}/></td>
 			  </tr>
+			  <tr class="field">
+				<td><label class="field-label" for="tf-no-interactive-shell-message">"No Interactive Shell" message:</label></td>
+				<td><input name="no-interactive-shell-message" id="tf-no-interactive-shell-message" class="field-tf" value="{{.Config.NoInteractiveShellMessage}}" /></td>
+			  </tr>
 			  <tr class="field">
 				<td></td>
 				<td><input class="field-submit" type="submit" value="Save Config" /></td>

templates/webinstaller/_nav.template.html

@@ -5,7 +5,7 @@
   <li><a href="/step3">Step 3: Session Config</a></li>
   <li><a href="/step4">Step 4: Mailer Config</a></li>
   <li><a href="/step5">Step 5: Receipt System Config</a></li>
-  <li><a href="/step6">Step 6: Git Root &amp; Git User</a></li>
+  <li><a href="/step6">Step 6: Git Config</a></li>
   <li><a href="/step7">Step 7: Ignored Namespace/Repositories</a></li>
   <li><a href="/step8">Step 8: Web Setup</a></li>
   <li><a href="/step9">Step 9: Confirm Code Manager Setup</a></li>