diff --git a/account/assets/js/panelHandlers/domains_subdomains/subdomain_add.js b/account/assets/js/panelHandlers/domains_subdomains/subdomain_add.js new file mode 100644 index 0000000..bf5bd5b --- /dev/null +++ b/account/assets/js/panelHandlers/domains_subdomains/subdomain_add.js @@ -0,0 +1,30 @@ +jQuery('._js_add-subdomain-form').on('submit', function(e){ + e.preventDefault(); + + if(jQuery('#addSubdomain') && jQuery('#addSubdomain').val() && jQuery('#subdomainRoot') && jQuery('#subdomainRoot').val()) { + var requestData = {}; + requestData["name"] = jQuery('#addSubdomain').val(); + requestData["root"] = jQuery('#subdomainRoot').val(); + + var xhr = new XMLHttpRequest(); + xhr.open(jQuery(this).attr('method'), jQuery(this).attr('action'), true); + xhr.send(JSON.stringify(requestData)); + + xhr.onloadend = function() { + if(xhr.status == 204) { + ListSubdomains(); + } + else { + if(xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.status); + } + else { + alert('An error has occurred. If problem persists please contact your community administrator.'); + } + } + } + } + else { + alert('All fields must be filled out to submit this form.'); + } +}); \ No newline at end of file diff --git a/account/assets/js/panelHandlers/domains_subdomains/subdomain_management.js b/account/assets/js/panelHandlers/domains_subdomains/subdomain_management.js new file mode 100644 index 0000000..9ced8a2 --- /dev/null +++ b/account/assets/js/panelHandlers/domains_subdomains/subdomain_management.js @@ -0,0 +1,37 @@ +var subdomainModal = jQuery('.subdomain-management-modal'); + +jQuery('._js_subdomain-management').on('click', function(e){ + e.preventDefault(); + + ListSubdomains(); + subdomainModal.modal('show'); +}); + +function ListSubdomains() { + var list = jQuery('._js_registered-subdomains'); + + var xhr = new XMLHttpRequest(); + xhr.open('GET', 'api/subdomain/list', true); + xhr.send(); + + xhr.onloadend = function() { + list.html(''); + if(xhr.status == 200) { + jsonResponse = JSON.parse(xhr.response) + jQuery.each(jsonResponse, function(k, v) { + list.append('

'+k+'

Root: '+v.root+'
'); + }); + } + else if(xhr.status == 204) { + list.html('

No registered subdomains exist for this account.

'); + } + else { + if(xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.status); + } + else { + alert('An error has occurred. If problem persists please contact your community administrator.'); + } + } + } +} \ No newline at end of file diff --git a/account/assets/js/panelHandlers/domains_subdomains/subdomain_remove.js b/account/assets/js/panelHandlers/domains_subdomains/subdomain_remove.js new file mode 100644 index 0000000..e67175e --- /dev/null +++ b/account/assets/js/panelHandlers/domains_subdomains/subdomain_remove.js @@ -0,0 +1,29 @@ +jQuery(document).on('click', '._js_delete-registered-subdomain', function(e){ + e.preventDefault(); + + var subdomain = jQuery(this).attr('data'); + var ensure = confirm("Are you sure you want to delete the subdomain \""+ subdomain +"\" from your account?"); + + if(ensure) { + var requestData = {}; + requestData["name"] = subdomain; + + var xhr = new XMLHttpRequest(); + xhr.open('DELETE', 'api/subdomain/remove', true); + xhr.send(JSON.stringify(requestData)); + + xhr.onloadend = function () { + if (xhr.status == 204) { + ListSubdomains(); + } + else { + if (xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.status); + } + else { + alert('An error has occurred. If problem persists please contact your community administrator.'); + } + } + } + } +}); \ No newline at end of file diff --git a/account/gPanel.html b/account/gPanel.html index 77924d8..cbd9b3a 100644 --- a/account/gPanel.html +++ b/account/gPanel.html @@ -349,6 +349,48 @@ + + +
@@ -447,6 +489,7 @@
View registered domains, register new domains, and set up or manage existing document roots for sub-domains.
+
@@ -501,6 +544,9 @@ + + + diff --git a/pkg/api/subdomain/add.go b/pkg/api/subdomain/add.go new file mode 100644 index 0000000..bc25c81 --- /dev/null +++ b/pkg/api/subdomain/add.go @@ -0,0 +1,48 @@ +package subdomain + +import ( + "encoding/json" + "log" + "net/http" + "strconv" + + "github.com/Ennovar/gPanel/pkg/database" +) + +func Add(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool { + if req.Method != "POST" { + logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) + http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) + return false + } + + var requestData struct { + Name string `json:"name"` + Root string `json:"root"` + } + + err := json.NewDecoder(req.Body).Decode(&requestData) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusBadRequest) + 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() + + err = ds.Put(database.BUCKET_SUBDOMAINS, []byte(requestData.Name), database.StructSubdomain{Root: requestData.Root}) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + res.WriteHeader(http.StatusNoContent) + return true +} diff --git a/pkg/api/subdomain/list.go b/pkg/api/subdomain/list.go new file mode 100644 index 0000000..c9c1119 --- /dev/null +++ b/pkg/api/subdomain/list.go @@ -0,0 +1,49 @@ +package subdomain + +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, http.StatusText(http.StatusMethodNotAllowed), 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() + + subdomains, err := ds.ListSubdomains() + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + if len(subdomains) > 0 { + b, err := json.Marshal(subdomains) + 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 +} diff --git a/pkg/api/subdomain/remove.go b/pkg/api/subdomain/remove.go new file mode 100644 index 0000000..9e6e153 --- /dev/null +++ b/pkg/api/subdomain/remove.go @@ -0,0 +1,47 @@ +package subdomain + +import ( + "encoding/json" + "log" + "net/http" + "strconv" + + "github.com/Ennovar/gPanel/pkg/database" +) + +func Remove(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool { + if req.Method != "DELETE" { + logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) + http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) + return false + } + + var requestData struct { + Name string `json:"name"` + } + + err := json.NewDecoder(req.Body).Decode(&requestData) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusBadRequest) + 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() + + err = ds.Delete(database.BUCKET_SUBDOMAINS, []byte(requestData.Name)) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + res.WriteHeader(http.StatusNoContent) + return true +} diff --git a/pkg/database/database.go b/pkg/database/database.go index 434f16b..0b4961d 100644 --- a/pkg/database/database.go +++ b/pkg/database/database.go @@ -14,7 +14,7 @@ import ( const ( DB_MAIN = "datastore.db" DB_SETTINGS = "settings.db" - DB_DOMAINS = "domains.db" + DB_DOMAINS = "domains.db" ) // Bucket constants @@ -23,9 +23,10 @@ const ( BUCKET_USERS = "users" BUCKET_PORTS = "ports" BUCKET_FILTERED_IPS = "filtered_ips" + BUCKET_SUBDOMAINS = "subdomains" // DB_SETTINGS BUCKETS - BUCKET_GENERAL = "general" + BUCKET_GENERAL = "general" BUCKET_NAMESERVERS = "nameservers" // DB_DOMAINS BUCKETS @@ -71,6 +72,11 @@ func Open(filepath string) (*Datastore, error) { if err != nil { return err } + + _, err = tx.CreateBucketIfNotExists([]byte(BUCKET_SUBDOMAINS)) + if err != nil { + return err + } } if strings.HasSuffix(filepath, DB_SETTINGS) { diff --git a/pkg/database/subdomains.go b/pkg/database/subdomains.go new file mode 100644 index 0000000..0bcc9aa --- /dev/null +++ b/pkg/database/subdomains.go @@ -0,0 +1,30 @@ +package database + +import ( + "encoding/json" + + "github.com/boltdb/bolt" +) + +type StructSubdomain struct { + Root string `json:"root"` +} + +func (ds *Datastore) ListSubdomains() (map[string]StructSubdomain, error) { + filtered := make(map[string]StructSubdomain) + var holder StructSubdomain + + ds.handle.View(func(tx *bolt.Tx) error { + b := tx.Bucket([]byte(BUCKET_SUBDOMAINS)) + c := b.Cursor() + + for k, v := c.First(); k != nil; k, v = c.Next() { + json.Unmarshal(v, &holder) + filtered[string(k)] = holder + } + + return nil + }) + + return filtered, nil +} diff --git a/pkg/gpaccount/apihandler.go b/pkg/gpaccount/apihandler.go index f345e04..8bc52c4 100644 --- a/pkg/gpaccount/apihandler.go +++ b/pkg/gpaccount/apihandler.go @@ -11,6 +11,7 @@ import ( "github.com/Ennovar/gPanel/pkg/api/server" "github.com/Ennovar/gPanel/pkg/api/settings" "github.com/Ennovar/gPanel/pkg/api/ssh" + "github.com/Ennovar/gPanel/pkg/api/subdomain" "github.com/Ennovar/gPanel/pkg/api/user" ) @@ -74,6 +75,12 @@ func (con *Controller) apiHandler(res http.ResponseWriter, req *http.Request) (b return true, ssh.DeleteKey(res, req, con.APILogger) case "/ssh/getkeys": return true, ssh.GetKeys(res, req, con.APILogger) + case "/subdomain/list": + return true, subdomain.List(res, req, con.APILogger, con.Directory) + case "/subdomain/add": + return true, subdomain.Add(res, req, con.APILogger, con.Directory) + case "/subdomain/remove": + return true, subdomain.Remove(res, req, con.APILogger, con.Directory) default: return false, false }