mirrors/acme-dns
1
0
Fork 0
mirror of https://github.com/joohoi/acme-dns.git synced 2025-07-05 15:58:32 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed register GET request in favor of POST, and did required HTTP api changes

Browse Source
This commit is contained in:
Joona Hoikkala
2016-12-02 15:42:10 +02:00
parent c3ac7a211c
commit 5f68d84ca5
4 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api.go
View File

@ -23,16 +23,18 @@ func (a authMiddleware) Serve(ctx *iris.Context) {
} else {
if correctPassword(password, au.Password) {
// Password ok
if err := ctx.ReadJSON(&postData); err == nil {
// Check that the subdomain belongs to the user
if au.Subdomain == postData.Subdomain {
ctx.Next()
if au.allowedFrom(ctx.RequestIP()) {
// Update is allowed from remote addr
if err := ctx.ReadJSON(&postData); err == nil {
if au.Subdomain == postData.Subdomain {
ctx.Next()
return
}
} else {
// JSON error
ctx.JSON(iris.StatusBadRequest, iris.Map{"error": "bad data"})
return
}
} else {
// JSON error
ctx.JSON(iris.StatusBadRequest, iris.Map{"error": "bad data"})
return
}
} else {
// Wrong password
@ -44,17 +46,19 @@ func (a authMiddleware) Serve(ctx *iris.Context) {
}
func webRegisterPost(ctx *iris.Context) {
// Create new user
nu, err := DB.Register(cidrslice{})
var regJSON iris.Map
var regStatus int
cslice := cidrslice{}
_ = ctx.ReadJSON(&cslice)
// Create new user
nu, err := DB.Register(cslice)
if err != nil {
errstr := fmt.Sprintf("%v", err)
regJSON = iris.Map{"error": errstr}
regStatus = iris.StatusInternalServerError
log.WithFields(log.Fields{"error": err.Error()}).Debug("Error in registration")
} else {
regJSON = iris.Map{"username": nu.Username, "password": nu.Password, "fulldomain": nu.Subdomain + "." + DNSConf.General.Domain, "subdomain": nu.Subdomain}
regJSON = iris.Map{"username": nu.Username, "password": nu.Password, "fulldomain": nu.Subdomain + "." + DNSConf.General.Domain, "subdomain": nu.Subdomain, "allowfrom": nu.AllowFrom.JSON()}
regStatus = iris.StatusCreated
log.WithFields(log.Fields{"user": nu.Username.String()}).Debug("Created new user")
@ -62,11 +66,6 @@ func webRegisterPost(ctx *iris.Context) {
ctx.JSON(regStatus, regJSON)
}
func webRegisterGet(ctx *iris.Context) {
// This is placeholder for now
webRegisterPost(ctx)
}
func webUpdatePost(ctx *iris.Context) {
// User auth done in middleware
a := ACMETxt{}