add asterisk to required fields, allow editing of device keys

h44z · Dec 18, 2020 · d978fd5 · d978fd5
1 parent ec60dd1
commit d978fd5
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 24 deletions.
diff --git a/assets/css/custom.css b/assets/css/custom.css
@@ -65,4 +65,9 @@ pre{background:#f7f7f9}iframe{overflow:hidden;border:none}@media (min-width: 768
     background-color: #f7f7f9;
     margin: -4px 5px 5px 0;
     height: 22px;
+}
+
+.form-group.required label:after {
+    content:"*";
+    color:red;
 }
diff --git a/assets/tpl/admin_create_clients.html b/assets/tpl/admin_create_clients.html
@@ -21,13 +21,13 @@ <h2>Enter valid LDAP user email addresses to quickly create new accounts.</h2>
         {{template "prt_flashes.html" .}}
         <form method="post" enctype="multipart/form-data">
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputEmail">Email Addresses</label>
                     <input type="text" name="email" class="form-control" id="inputEmail" value="{{.FormData.Emails}}">
                 </div>
             </div>
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputIdentifier">Client Friendly Name (will be added as suffix to the name of the user)</label>
                     <input type="text" name="identifier" class="form-control" id="inputIdentifier" value="{{.FormData.Identifier}}">
                 </div>

diff --git a/assets/tpl/admin_edit_client.html b/assets/tpl/admin_edit_client.html
@@ -31,7 +31,7 @@ <h1>Edit client <strong>{{.Peer.Identifier}}</strong></h1>
                     </div>
                 </div>
                 <div class="form-row">
-                    <div class="form-group col-md-12">
+                    <div class="form-group required col-md-12">
                         <label for="inputServerPublicKey">Public Key</label>
                         <input type="text" name="pubkey" class="form-control" id="inputServerPublicKey" value="{{.Peer.PublicKey}}">
                     </div>
@@ -53,25 +53,25 @@ <h1>Edit client <strong>{{.Peer.Identifier}}</strong></h1>
                 </div>
             {{end}}
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputIdentifier">Client Friendly Name</label>
                     <input type="text" name="identifier" class="form-control" id="inputIdentifier" value="{{.Peer.Identifier}}">
                 </div>
             </div>
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputEmail">Client Email Address</label>
                     <input type="email" name="mail" class="form-control" id="inputEmail" value="{{.Peer.Email}}">
                 </div>
             </div>
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputIP">Client IP Address</label>
                     <input type="text" name="ip" class="form-control" id="inputIP" value="{{.Peer.IPsStr}}">
                 </div>
             </div>
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputAllowedIP">Allowed IPs</label>
                     <input type="text" name="allowedip" class="form-control" id="inputAllowedIP" value="{{.Peer.AllowedIPsStr}}">
                 </div>

diff --git a/assets/tpl/admin_edit_interface.html b/assets/tpl/admin_edit_interface.html
@@ -18,27 +18,42 @@ <h1>Edit interface <strong>{{.Device.DeviceName}}</strong></h1>
 
         <form method="post" enctype="multipart/form-data">
             <input type="hidden" name="device" value="{{.Device.DeviceName}}">
-            <input type="hidden" name="privkey" value="{{.Device.PrivateKey}}">
             <h3>Server's interface configuration</h3>
+            {{if .EditableKeys}}
+            <div class="form-row">
+                <div class="form-group required col-md-12">
+                    <label for="inputServerPrivateKey">Private Key</label>
+                    <input type="text" name="privkey" class="form-control" id="inputServerPrivateKey" value="{{.Device.PrivateKey}}">
+                </div>
+            </div>
+            <div class="form-row">
+                <div class="form-group required col-md-12">
+                    <label for="inputServerPublicKey">Public Key</label>
+                    <input type="text" name="pubkey" class="form-control" id="inputServerPublicKey" value="{{.Device.PublicKey}}">
+                </div>
+            </div>
+            {{else}}
+            <input type="hidden" name="privkey" value="{{.Device.PrivateKey}}">
             <div class="form-row">
                 <div class="form-group col-md-12">
                     <label for="inputServerPublicKey">Public Key</label>
                     <input type="text" name="pubkey" readonly class="form-control" id="inputServerPublicKey" value="{{.Device.PublicKey}}">
                 </div>
             </div>
+            {{end}}
             <div class="form-row">
-                <div class="form-group col-md-6">
+                <div class="form-group required col-md-6">
                     <label for="inputListenPort">Listen port</label>
                     <input type="number" name="port" class="form-control" id="inputListenPort" placeholder="51820" value="{{.Device.ListenPort}}">
                 </div>
-                <div class="form-group col-md-6">
+                <div class="form-group required col-md-6">
                     <label for="inputIPs">Server IP address</label>
                     <input type="text" name="ip" class="form-control" id="inputIPs" placeholder="10.6.6.1/24" value="{{.Device.IPsStr}}">
                 </div>
             </div>
             <h3>Client's global configuration</h3>
             <div class="form-row">
-                <div class="form-group col-md-12">
+                <div class="form-group required col-md-12">
                     <label for="inputPublicEndpoint">Public Enpoint for Clients</label>
                     <input type="text" name="endpoint" class="form-control" id="inputPublicEndpoint" placeholder="vpn.company.com:51820" value="{{.Device.Endpoint}}">
                 </div>

diff --git a/internal/server/handlers_interface.go b/internal/server/handlers_interface.go
@@ -19,19 +19,21 @@ func (s *Server) GetAdminEditInterface(c *gin.Context) {
 	}
 
 	c.HTML(http.StatusOK, "admin_edit_interface.html", struct {
-		Route   string
-		Alerts  []FlashData
-		Session SessionData
-		Static  StaticData
-		Peers   []User
-		Device  Device
+		Route        string
+		Alerts       []FlashData
+		Session      SessionData
+		Static       StaticData
+		Peers        []User
+		Device       Device
+		EditableKeys bool
 	}{
-		Route:   c.Request.URL.Path,
-		Alerts:  s.getFlashes(c),
-		Session: currentSession,
-		Static:  s.getStaticData(),
-		Peers:   users,
-		Device:  currentSession.FormData.(Device),
+		Route:        c.Request.URL.Path,
+		Alerts:       s.getFlashes(c),
+		Session:      currentSession,
+		Static:       s.getStaticData(),
+		Peers:        users,
+		Device:       currentSession.FormData.(Device),
+		EditableKeys: s.config.Core.EditableKeys,
 	})
 }
 

diff --git a/internal/server/usermanager.go b/internal/server/usermanager.go
@@ -202,7 +202,7 @@ type Device struct {
 	Interface *wgtypes.Device `gorm:"-"`
 
 	DeviceName          string   `form:"device" gorm:"primaryKey" binding:"required,alphanum"`
-	PrivateKey          string   `form:"privkey" binding:"base64"`
+	PrivateKey          string   `form:"privkey" binding:"required,base64"`
 	PublicKey           string   `form:"pubkey" binding:"required,base64"`
 	PersistentKeepalive int      `form:"keepalive" binding:"gte=0"`
 	ListenPort          int      `form:"port" binding:"required,gt=0"`