Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-21 23:21:26 +01:00
Code Issues Projects Releases Wiki Activity

move target.go to api/

Browse Source
This commit is contained in:
Wenkai Yin 2016-05-23 18:41:48 +08:00
parent 772280d4e3
commit 7449b3604c
4 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
api/jobs/target.go → api/target.go
View File

@ -16,12 +16,12 @@
package api
import (
"encoding/base64"
"fmt"
"net/http"
"net/url"
"strconv"
"github.com/vmware/harbor/api"
"github.com/vmware/harbor/dao"
"github.com/vmware/harbor/models"
"github.com/vmware/harbor/utils/log"
@ -31,7 +31,7 @@ import (
// TargetAPI handles request to /api/targets/ping /api/targets/{}
type TargetAPI struct {
api.BaseAPI
BaseAPI
}
// Prepare validates the user
@ -74,7 +74,14 @@ func (t *TargetAPI) Ping() {
}
username = t.GetString("username")
password = t.GetString("password")
pwd := t.GetString("password")
b, err := base64.StdEncoding.DecodeString(pwd)
if err != nil {
log.Errorf("failed to decode password: %v", err)
t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
password = string(b)
}
credential := auth.NewBasicAuthCredential(username, password)
@ -129,6 +136,18 @@ func (t *TargetAPI) Get() {
log.Errorf("failed to get all targets: %v", err)
t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
for _, target := range targets {
if len(target.Password) != 0 {
b, err := base64.StdEncoding.DecodeString(target.Password)
if err != nil {
log.Errorf("failed to decode password: %v", err)
t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
target.Password = string(b)
}
}
t.Data["json"] = targets
t.ServeJSON()
return
@ -144,6 +163,15 @@ func (t *TargetAPI) Get() {
t.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound))
}
if len(target.Password) != 0 {
b, err := base64.StdEncoding.DecodeString(target.Password)
if err != nil {
log.Errorf("failed to decode password: %v", err)
t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
target.Password = string(b)
}
t.Data["json"] = target
t.ServeJSON()
}
@ -157,6 +185,10 @@ func (t *TargetAPI) Post() {
t.CustomAbort(http.StatusBadRequest, "name or URL is nil")
}
if len(target.Password) != 0 {
target.Password = base64.StdEncoding.EncodeToString([]byte(target.Password))
}
id, err := dao.AddRepTarget(*target)
if err != nil {
log.Errorf("failed to add target: %v", err)
@ -180,6 +212,10 @@ func (t *TargetAPI) Put() {
t.CustomAbort(http.StatusBadRequest, "IDs mismatch")
}
if len(target.Password) != 0 {
target.Password = base64.StdEncoding.EncodeToString([]byte(target.Password))
}
if err := dao.UpdateRepTarget(*target); err != nil {
log.Errorf("failed to update target %d: %v", id, err)
t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
@ -187,15 +223,14 @@ func (t *TargetAPI) Put() {
}
func (t *TargetAPI) getIDFromURL() int64 {
idStr := t.Ctx.Input.Param("id")
idStr := t.Ctx.Input.Param(":id")
if len(idStr) == 0 {
return 0
}
id, err := strconv.ParseInt(idStr, 10, 64)
if err != nil {
log.Errorf("failed to get ID from URL: %v", err)
t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
t.CustomAbort(http.StatusBadRequest, "invalid ID in request URL")
}
return id

6
dao/replication_job.go
View File

@ -32,11 +32,11 @@ func UpdateRepTarget(target models.RepTarget) error {
return err
}
func GetAllRepTargets() ([]models.RepTarget, error) {
func GetAllRepTargets() ([]*models.RepTarget, error) {
o := orm.NewOrm()
qs := o.QueryTable(&models.RepTarget{})
var targets []models.RepTarget
_, err := qs.All(targets)
var targets []*models.RepTarget
_, err := qs.All(&targets)
return targets, err
}

2
jobservice/router.go
View File

@ -9,6 +9,4 @@ import (
func initRouters() {
beego.Router("/api/jobs/replication", &api.ReplicationJob{})
beego.Router("/api/jobs/replication/actions", &api.ReplicationJob{}, "post:HandleAction")
beego.Router("/api/jobs/targets/?:id", &api.TargetAPI{})
beego.Router("/api/jobs/targets/ping", &api.TargetAPI{}, "get:Ping")
}

2
ui/router.go
View File

@ -61,6 +61,8 @@ func initRouters() {
beego.Router("/api/repositories", &api.RepositoryAPI{})
beego.Router("/api/repositories/tags", &api.RepositoryAPI{}, "get:GetTags")
beego.Router("/api/repositories/manifests", &api.RepositoryAPI{}, "get:GetManifests")
beego.Router("/api/targets/?:id", &api.TargetAPI{})
beego.Router("/api/targets/ping", &api.TargetAPI{}, "get:Ping")
//external service that hosted on harbor process:
beego.Router("/service/notifications", &service.NotificationHandler{})