Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 22:30:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

try to improve web client credentials page

Browse Source 
I should do the same for the admin page too
This commit is contained in:
Nicola Murino
2021-05-22 09:54:27 +02:00
parent 0cb5c49cf3
commit b9bc8d722d
4 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dataprovider/dataprovider.go
View File

@@ -1271,12 +1271,18 @@ func validatePublicKeys(user *User) error {
if len(user.PublicKeys) == 0 { if len(user.PublicKeys) == 0 {
user.PublicKeys = []string{} user.PublicKeys = []string{}
} }
var validatedKeys []string
for i, k := range user.PublicKeys { for i, k := range user.PublicKeys {
if k == "" {
continue
}
_, _, _, _, err := ssh.ParseAuthorizedKey([]byte(k)) _, _, _, _, err := ssh.ParseAuthorizedKey([]byte(k))
if err != nil { if err != nil {
return &ValidationError{err: fmt.Sprintf("could not parse key nr. %d: %s", i, err)} return &ValidationError{err: fmt.Sprintf("could not parse key nr. %d: %s", i, err)}
} }
validatedKeys = append(validatedKeys, k)
} }
user.PublicKeys = validatedKeys
return nil return nil
} }

BIN
docs/howto/img/web-client-credentials.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 64 KiB

4
httpd/webclient.go
View File

@@ -370,9 +370,7 @@ func handleWebClientManageKeysPost(w http.ResponseWriter, r *http.Request) {
renderCredentialsPage(w, r, "", err.Error()) renderCredentialsPage(w, r, "", err.Error())
return return
} }
publicKeysFormValue := r.Form.Get("public_keys") user.PublicKeys = r.Form["public_keys"]
publicKeys := getSliceFromDelimitedValues(publicKeysFormValue, "\n")
user.PublicKeys = publicKeys
err = dataprovider.UpdateUser(&user) err = dataprovider.UpdateUser(&user)
if err != nil { if err != nil {
renderCredentialsPage(w, r, "", err.Error()) renderCredentialsPage(w, r, "", err.Error())

70
templates/webclient/credentials.html
View File

@@ -53,18 +53,42 @@
</div> </div>
{{end}} {{end}}
<form id="key_form" action="{{.ManageKeysURL}}" method="POST"> <form id="key_form" action="{{.ManageKeysURL}}" method="POST">
<div class="form-group row"> <div class="form-group row">
<label for="idPublicKeys" class="col-sm-2 col-form-label">Keys</label> <div class="col-md-12 form_field_pk_outer">
<div class="col-sm-10"> {{range $idx, $val := .PublicKeys}}
<textarea class="form-control" id="idPublicKeys" name="public_keys" rows="5" <div class="row form_field_pk_outer_row">
aria-describedby="pkHelpBlock">{{range .PublicKeys}}{{.}}&#10;{{end}}</textarea> <div class="form-group col-md-11">
<small id="pkHelpBlock" class="form-text text-muted"> <textarea class="form-control" id="idPublicKey{{$idx}}" name="public_keys" rows="4"
One public key per line placeholder="Paste your public key here">{{$val}}</textarea>
</small> </div>
<div class="form-group col-md-1">
<button class="btn btn-circle btn-danger remove_pk_btn_frm_field" {{if eq $idx 0}}disabled{{end}}>
<i class="fas fa-trash"></i>
</button>
</div>
</div>
{{else}}
<div class="row form_field_pk_outer_row">
<div class="form-group col-md-11">
<textarea class="form-control" id="idPublicKey0" name="public_keys" rows="4"
placeholder="Paste your public key here"></textarea>
</div>
<div class="form-group col-md-1">
<button class="btn btn-circle btn-danger remove_pk_btn_frm_field" disabled>
<i class="fas fa-trash"></i>
</button>
</div>
</div>
{{end}}
</div> </div>
</div> </div>
<div class="row mx-1">
<button type="button" class="btn btn-secondary add_new_pk_field_btn">
<i class="fas fa-plus"></i> Add new public key
</button>
</div>
<input type="hidden" name="_form_token" value="{{.CSRFToken}}"> <input type="hidden" name="_form_token" value="{{.CSRFToken}}">
<button type="submit" class="btn btn-primary float-right mt-3 px-5 px-3">Submit</button> <button type="submit" class="btn btn-primary float-right mt-3 px-5 px-3">Submit</button>
</form> </form>
@@ -72,3 +96,33 @@
</div> </div>
{{end}} {{end}}
{{end}} {{end}}
{{define "extra_js"}}
<script type="text/javascript">
$(document).ready(function () {
$("body").on("click", ".add_new_pk_field_btn", function () {
var index = $(".form_field_pk_outer").find(".form_field_pk_outer_row").length;
$(".form_field_pk_outer").append(`
<div class="row form_field_pk_outer_row">
<div class="form-group col-md-11">
<textarea class="form-control" id="idPublicKey${index}" name="public_keys" rows="4"
placeholder="Paste your public key here"></textarea>
</div>
<div class="form-group col-md-1">
<button class="btn btn-circle btn-danger remove_pk_btn_frm_field" disabled>
<i class="fas fa-trash"></i>
</button>
</div>
</div>
`);
$(".form_field_pk_outer").find(".remove_pk_btn_frm_field:not(:first)").prop("disabled", false);
$(".form_field_pk_outer").find(".remove_pk_btn_frm_field").first().prop("disabled", true);
});
$("body").on("click", ".remove_pk_btn_frm_field", function () {
$(this).closest(".form_field_pk_outer_row").remove();
});
});
</script>
{{end}}