mirror of
https://github.com/donl/gPanel.git
synced 2026-05-25 22:06:55 -06:00
Merge pull request #98 from george-e-shaw-iv/master
Adding new users to server now works in gPanel Server
This commit is contained in:
George Shaw
GitHub
commit
a12a0e5073
6 changed files with 277 additions and 0 deletions
50
pkg/api/user/list.go
Normal file
50
pkg/api/user/list.go
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
package user
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/Ennovar/gPanel/pkg/database"
|
||||
)
|
||||
|
||||
func List(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool {
|
||||
if req.Method != "GET" {
|
||||
logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed))
|
||||
http.Error(res, req.Method+" HTTP method is unsupported for this API.", http.StatusMethodNotAllowed)
|
||||
return false
|
||||
}
|
||||
|
||||
ds, err := database.Open(dir + database.DB_MAIN)
|
||||
if err != nil || ds == nil {
|
||||
logger.Println(req.URL.Path + "::" + err.Error())
|
||||
http.Error(res, err.Error(), http.StatusInternalServerError)
|
||||
return false
|
||||
}
|
||||
defer ds.Close()
|
||||
|
||||
users, err := ds.ListAllUsers()
|
||||
if err != nil {
|
||||
logger.Println(req.URL.Path + "::" + err.Error())
|
||||
http.Error(res, err.Error(), http.StatusInternalServerError)
|
||||
return false
|
||||
}
|
||||
|
||||
if len(users) > 0 {
|
||||
b, err := json.Marshal(users)
|
||||
if err != nil {
|
||||
logger.Println(req.URL.Path + "::" + err.Error())
|
||||
http.Error(res, err.Error(), http.StatusInternalServerError)
|
||||
return false
|
||||
}
|
||||
|
||||
res.WriteHeader(http.StatusOK)
|
||||
res.Write(b)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
res.WriteHeader(http.StatusNoContent)
|
||||
return true
|
||||
}
|
||||
20
pkg/database/users.go
Normal file
20
pkg/database/users.go
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
package database
|
||||
|
||||
import "github.com/boltdb/bolt"
|
||||
|
||||
func (ds *Datastore) ListAllUsers() ([]string, error) {
|
||||
users := []string{}
|
||||
|
||||
ds.handle.View(func(tx *bolt.Tx) error {
|
||||
b := tx.Bucket([]byte(BUCKET_USERS))
|
||||
c := b.Cursor()
|
||||
|
||||
for k, _ := c.First(); k != nil; k, _ = c.Next() {
|
||||
users = append(users, string(k))
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
return users, nil
|
||||
}
|
||||
|
|
@ -72,6 +72,8 @@ func (con *Controller) apiHandler(res http.ResponseWriter, req *http.Request) (b
|
|||
return true, user.Register(res, req, con.APILogger, con.Directory)
|
||||
case "/user/logout":
|
||||
return true, user.Logout(res, req, con.APILogger, con.Directory)
|
||||
case "/user/list":
|
||||
return true, user.List(res, req, con.APILogger, con.Directory)
|
||||
case "/bundle/create":
|
||||
return true, bundle.Create(res, req, con.APILogger, con.Bundles)
|
||||
case "/bundle/list":
|
||||
|
|
|
|||
80
server/document_root/assets/js/panelHandlers/users/new.js
Normal file
80
server/document_root/assets/js/panelHandlers/users/new.js
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
var userModal = jQuery('.user-management-modal');
|
||||
|
||||
var usernameInput = jQuery('#addUserUsername');
|
||||
var passwordInput = jQuery('#addUserPassword');
|
||||
var passwordInputRetype = jQuery('#addUserPasswordRetype');
|
||||
|
||||
jQuery('._js_add-user-form').on('submit', function(e){
|
||||
e.preventDefault();
|
||||
|
||||
if((usernameInput && usernameInput.val()) && (passwordInput && passwordInput.val()) && (passwordInputRetype && passwordInputRetype.val())) {
|
||||
if(passwordInput.val() == passwordInputRetype.val()) {
|
||||
var requestData = {};
|
||||
requestData["user"] = usernameInput.val();
|
||||
requestData["pass"] = passwordInput.val();
|
||||
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.open(jQuery(this).attr('method'), jQuery(this).attr('action'), true);
|
||||
xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
|
||||
xhr.send(JSON.stringify(requestData));
|
||||
|
||||
xhr.onloadend = function() {
|
||||
if(xhr.status == 204) {
|
||||
listCurrentUsers();
|
||||
}
|
||||
else {
|
||||
if(xhr.response != undefined && xhr.response.length != 0) {
|
||||
alert('Error: ' + xhr.response);
|
||||
}
|
||||
else {
|
||||
alert('An error has occurred, refresh and try again. If problem persists please contact your administrator.');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
alert('Password fields do not match.');
|
||||
}
|
||||
}
|
||||
else {
|
||||
alert('All fields must contain values.');
|
||||
}
|
||||
});
|
||||
|
||||
jQuery('._js_add-user-generate-password').on('click', function(e){
|
||||
e.preventDefault();
|
||||
var gen = "";
|
||||
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+-[]:;<>?";
|
||||
|
||||
for (var i = 0; i < 32; i++) {
|
||||
gen += chars.charAt(Math.floor(Math.random() * chars.length));
|
||||
}
|
||||
|
||||
toggleShowPassword(true);
|
||||
passwordInput.prop('value', gen);
|
||||
passwordInputRetype.prop('value', gen);
|
||||
});
|
||||
|
||||
jQuery('._js_user-management-show-password').on('change', function(e){
|
||||
e.preventDefault();
|
||||
|
||||
if(this.checked) {
|
||||
toggleShowPassword(true);
|
||||
}
|
||||
else {
|
||||
toggleShowPassword(false);
|
||||
}
|
||||
});
|
||||
|
||||
function toggleShowPassword(show) {
|
||||
if(show) {
|
||||
jQuery('._js_user-management-show-password').prop('checked', true);
|
||||
passwordInput.attr('type', 'text');
|
||||
passwordInputRetype.attr('type', 'text');
|
||||
}
|
||||
else {
|
||||
jQuery('._js_user-management-show-password').prop('checked', false);
|
||||
passwordInput.attr('type', 'password');
|
||||
passwordInputRetype.attr('type', 'password');
|
||||
}
|
||||
}
|
||||
50
server/document_root/assets/js/panelHandlers/users/open.js
Normal file
50
server/document_root/assets/js/panelHandlers/users/open.js
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
var userModal = jQuery('.user-management-modal');
|
||||
|
||||
jQuery('._js_manage-users').on('click', function(e){
|
||||
e.preventDefault();
|
||||
|
||||
jQuery('._js_user-management-show-password').prop('checked', false);
|
||||
|
||||
listCurrentUsers();
|
||||
userModal.modal('show');
|
||||
});
|
||||
|
||||
function listCurrentUsers() {
|
||||
var display = jQuery('._js_current-users');
|
||||
display.html('');
|
||||
var requestData = {};
|
||||
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.open('GET', 'api/user/list', true);
|
||||
xhr.send();
|
||||
|
||||
xhr.onloadend = function() {
|
||||
if(xhr.status == 200) {
|
||||
if(xhr.response != undefined && xhr.response.length != 0) {
|
||||
jsonResponse = JSON.parse(xhr.response)
|
||||
jQuery.each(jsonResponse, function(k, v) {
|
||||
display.append('<div class="row mt-2"><div class="col-6 d-flex align-items-center"><p class="mb-0">'+v+'</p></div><div class="col-6 d-flex justify-content-end"><div class="btn-group" role="group"><button class="btn btn-outline-primary _js_user-management-new-password" data="'+v+'">New Password</button><button class="btn btn-outline-primary _js_user-management-delete" data="'+v+'">Delete</button></div></div></div>');
|
||||
});
|
||||
}
|
||||
else {
|
||||
display.html('<p>An error has occurred, please refresh. If problem persists please contact your administrator.</p>');
|
||||
}
|
||||
}
|
||||
else if(xhr.status == 204) {
|
||||
if(xhr.response != undefined && xhr.response.length != 0) {
|
||||
display.html('<p>There are no users in the server. This is a problem, this shouldn\'t be like this.</p>');
|
||||
}
|
||||
else {
|
||||
display.html('<p>An error has occurred, please refresh. If problem persists please contact your administrator.</p>');
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(xhr.response != undefined && xhr.response.length != 0) {
|
||||
display.html('<p>Error: ' + xhr.response + '</p>');
|
||||
}
|
||||
else {
|
||||
display.html('<p>An error has occurred, please refresh. If problem persists please contact your administrator.</p>');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -173,6 +173,64 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- User Management Modal -->
|
||||
<div class="modal fade user-management-modal" tabindex="-1" role="dialog" aria-labelledby="user-management-modal" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Manage Server Users</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<h4>Add User</h4>
|
||||
<form class="_js_add-user-form" action="api/user/register" method="POST">
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="addUserUsername">Username</label>
|
||||
<div class="input-group mb-2">
|
||||
<div class="input-group-addon"><i class="fa fa-user" aria-hidden="true"></i></div>
|
||||
<input name="user" type="text" class="form-control" id="addUserUsername" placeholder="Username">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="addUserPassword">Password</label>
|
||||
<div class="input-group">
|
||||
<div class="input-group-addon"><i class="fa fa-key" aria-hidden="true"></i></div>
|
||||
<input name="pass" type="password" class="form-control" id="addUserPassword" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="addUserPasswordRetype">Re-type Password</label>
|
||||
<div class="input-group">
|
||||
<div class="input-group-addon"><i class="fa fa-key" aria-hidden="true"></i></div>
|
||||
<input name="pass" type="password" class="form-control" id="addUserPasswordRetype" placeholder="Re-type Password">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<label class="form-check-label">
|
||||
<input type="checkbox" class="form-check-input _js_user-management-show-password">
|
||||
Show Password
|
||||
</label>
|
||||
</div>
|
||||
<div class="btn-group" role="group">
|
||||
<button type="submit" class="btn btn-primary">Add User</button>
|
||||
<button type="button" class="btn btn-success _js_add-user-generate-password">Generate Strong Password</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<h4 class="mt-3 mb-0">Current Users</h4>
|
||||
<div class="container-full _js_current-users">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
|
|
@ -202,6 +260,20 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mt-5">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4 class="card-title">Server Users</h4>
|
||||
<h6 class="card-subtitle mb-4 text-muted">View, edit, update, and remove users that can access the gPanel Server</h6>
|
||||
<div class="btn-group" role="group">
|
||||
<button type="button" class="btn btn-outline-primary _js_manage-users">Manage Users</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="sticky-footer">
|
||||
|
|
@ -242,6 +314,9 @@
|
|||
|
||||
<script type="text/javascript" src="assets/js/panelHandlers/log/view.js"></script>
|
||||
<script type="text/javascript" src="assets/js/panelHandlers/log/delete.js"></script>
|
||||
|
||||
<script type="text/javascript" src="assets/js/panelHandlers/users/open.js"></script>
|
||||
<script type="text/javascript" src="assets/js/panelHandlers/users/new.js"></script>
|
||||
<!-- KEEP AT BOTTOM OF BODY TAGS -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue