Fix logic error in updating Drawbridge config. Use readonly instead of disabled to send listener address

Author: imdawon

cmd/dashboard/ui/api.go

@@ -147,24 +147,25 @@ func (f *Controller) SetUp(hostAndPort string) error {
 		newSettings := drawbridge.Settings{}
 		decoder.Decode(&newSettings, r.Form)
 
-		if newSettings.ListenerAddress == "" {
-			w.WriteHeader(http.StatusBadRequest)
-			fmt.Fprintf(w, "<span class=\"error-response\">Listening address is blank! Please try again.<span>")
-		} else if newSettings.ListenerAddress == "localhost" {
+		if newSettings.ListenerAddress == "localhost" {
 			newSettings.ListenerAddress = "127.0.0.1"
 		}
-
-		err := f.DB.CreateNewDrawbridgeConfigSettings("listening_address", strings.TrimSpace(newSettings.ListenerAddress))
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			fmt.Fprintf(w, "<span class=\"error-response\">Error saving listening address. Please try again.<span>")
+		if newSettings.ListenerAddress != "" {
+			err := f.DB.CreateNewDrawbridgeConfigSettings("listening_address", strings.TrimSpace(newSettings.ListenerAddress))
+			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+				fmt.Fprintf(w, "<span class=\"error-response\">Error saving listening address. Please try again.<span>")
+				return
+			}
 		}
 
-		err = f.DB.CreateNewDrawbridgeConfigSettings("dau_ping_enabled", strconv.FormatBool(newSettings.EnableDAUPing))
+		err := f.DB.CreateNewDrawbridgeConfigSettings("dau_ping_enabled", strconv.FormatBool(newSettings.EnableDAUPing))
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			fmt.Fprintf(w, "<span class=\"error-response\">Error saving listening address. Please try again.<span>")
+			return
 		}
+
 		w.WriteHeader(http.StatusOK)
 		fmt.Fprintf(w, "%s:%d", newSettings.ListenerAddress, 3100)
 	})

cmd/dashboard/ui/templates/get_oboarding_modal_configure.templ

@@ -13,7 +13,7 @@ templ GetOnboardingModalConfigure(listeningAddress string, dauPingEnabled bool)
                 <label for="listener-address">What IP should Drawbridge be accessible from?</label>
                 <p class="note-text">Note: this is the address your Emissary clients will use to connect to Drawbridge. It can be your LAN (local) or WAN (accessible outside your network) address.</p>
                 <p style="color:orange">IP not yet available to edit - will break Drawbridge certificates. Coming soon.</p>
-                <input name="listener-address" type="text" id="listener-address" placeholder="50.42.165.84" value={ listeningAddress } disabled/>
+                <input name="listener-address" type="text" id="listener-address" placeholder="50.42.165.84" value={ listeningAddress } readonly/>
                 <label for="enable-ping">
                     if dauPingEnabled {
                         <input type="checkbox" id="enable-ping" name="enable-ping" checked/>