From 948e5ad1c5c6e0af611a467563717149777d4c80 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Fri, 1 Apr 2016 04:42:13 -0700
Subject: [PATCH 01/13] change register to api/users

---
 api/user.go       | 88 +++++++++++++++++++++++++++++++++++++++++++++++
 routers/router.go |  3 +-
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/api/user.go b/api/user.go
index 482ab319b..985edf1cb 100644
--- a/api/user.go
+++ b/api/user.go
@@ -16,8 +16,10 @@
 package api
 
 import (
+	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/models"
@@ -31,9 +33,18 @@ type UserAPI struct {
 	userID        int
 }
 
+const userNameMaxLen int = 20
+const passwordMaxLen int = 20
+const realNameMaxLen int = 20
+const commentsMaxLen int = 20
+
 // Prepare validates the URL and parms
 func (ua *UserAPI) Prepare() {
 
+	if ua.Ctx.Input.IsPost() {
+		return
+	}
+
 	ua.currentUserID = ua.ValidateUser()
 	id := ua.Ctx.Input.Param(":id")
 	if id == "current" {
@@ -117,6 +128,44 @@ func (ua *UserAPI) Put() { //currently only for toggle admin, so no request body
 	dao.ToggleUserAdminRole(userQuery)
 }
 
+// Post ...
+func (ua *UserAPI) Post() {
+	username := strings.TrimSpace(ua.GetString("username"))
+	password := strings.TrimSpace(ua.GetString("password"))
+	email := strings.TrimSpace(ua.GetString("email"))
+	realname := strings.TrimSpace(ua.GetString("realname"))
+	comment := strings.TrimSpace(ua.GetString("comment"))
+
+	err := validateUserReq(ua)
+	if err != nil {
+		log.Errorf("Invalid user request, error: %v", err)
+		ua.RenderError(http.StatusBadRequest, "Invalid request for creating user")
+		return
+	}
+
+	user := models.User{Username: username, Email: email, Realname: realname, Password: password, Comment: comment}
+	exist, err := dao.UserExists(user, "email")
+	if err != nil {
+		log.Errorf("Error occurred in UserExists:", err)
+	}
+	if exist {
+		ua.RenderError(http.StatusConflict, "")
+		return
+	}
+
+	userID, err := dao.Register(user)
+	if err != nil {
+		log.Errorf("Error occurred in Register:", err)
+		ua.RenderError(http.StatusInternalServerError, "Internal error.")
+		return
+	}
+	if userID == 0 {
+		log.Errorf("Error happened on registing new user in db.")
+		ua.RenderError(http.StatusInternalServerError, "Internal error.")
+	}
+
+}
+
 // Delete ...
 func (ua *UserAPI) Delete() {
 	exist, err := dao.IsAdminRole(ua.currentUserID)
@@ -136,3 +185,42 @@ func (ua *UserAPI) Delete() {
 		return
 	}
 }
+
+func validateUserReq(ua *UserAPI) error {
+	userName := ua.GetString("username")
+	if len(userName) == 0 {
+		return fmt.Errorf("User name can not be empty")
+	}
+	if len(userName) > userNameMaxLen {
+		return fmt.Errorf("User name is too long")
+	}
+
+	password := ua.GetString("password")
+	if len(password) == 0 {
+		return fmt.Errorf("Password can not be empty")
+	}
+	if len(password) >= passwordMaxLen {
+		return fmt.Errorf("Password can is too long")
+	}
+
+	realName := ua.GetString("realname")
+	if len(realName) == 0 {
+		return fmt.Errorf("Real name can not be empty")
+	}
+	if len(realName) >= realNameMaxLen {
+		return fmt.Errorf("Real name is too long")
+	}
+
+	email := ua.GetString("email")
+	if len(email) == 0 {
+		return fmt.Errorf("Email can not be empty")
+	}
+
+	comments := ua.GetString("comment")
+	if len(comments) != 0 {
+		if len(comments) >= commentsMaxLen {
+			return fmt.Errorf("Comments is too long")
+		}
+	}
+	return nil
+}
diff --git a/routers/router.go b/routers/router.go
index 764a3c7e6..e8dab001f 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -32,7 +32,7 @@ func init() {
 	beego.Router("/login", &controllers.CommonController{}, "post:Login")
 	beego.Router("/logout", &controllers.CommonController{}, "get:Logout")
 	beego.Router("/language", &controllers.CommonController{}, "get:SwitchLanguage")
-	beego.Router("/signUp", &controllers.CommonController{}, "post:SignUp")
+	//	beego.Router("/signUp", &controllers.CommonController{}, "post:SignUp")
 	beego.Router("/userExists", &controllers.CommonController{}, "post:UserExists")
 	beego.Router("/reset", &controllers.CommonController{}, "post:ResetPassword")
 	beego.Router("/sendEmail", &controllers.CommonController{}, "get:SendEmail")
@@ -55,6 +55,7 @@ func init() {
 	beego.Router("/api/projects/:pid/members/?:mid", &api.ProjectMemberAPI{})
 	beego.Router("/api/projects/?:id", &api.ProjectAPI{})
 	beego.Router("/api/projects/:id/logs/filter", &api.ProjectAPI{}, "post:FilterAccessLog")
+	beego.Router("/api/users", &api.UserAPI{})
 	beego.Router("/api/users/?:id", &api.UserAPI{})
 	beego.Router("/api/repositories", &api.RepositoryAPI{})
 	beego.Router("/api/repositories/tags", &api.RepositoryAPI{}, "get:GetTags")

From fca2838b332851d322c34cea0658677154415b7c Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Fri, 1 Apr 2016 04:56:43 -0700
Subject: [PATCH 02/13] update api/users

---
 static/resources/js/register.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/resources/js/register.js b/static/resources/js/register.js
index cbd133671..7f0b21d4a 100644
--- a/static/resources/js/register.js
+++ b/static/resources/js/register.js
@@ -37,7 +37,7 @@ jQuery(function(){
 			var realname = $.trim($("#Realname").val());
 			var comment  = $.trim($("#Comment").val());
 			$.ajax({
-				url : '/signUp',
+				url : "/api/users",
 				data:{username: username, password: password, realname: realname, comment: comment, email: email},
 				type: "POST",
 				beforeSend: function(e){

From be0d71d61db9dce7b31a45be7d92fa70623659de Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Tue, 5 Apr 2016 02:30:23 -0700
Subject: [PATCH 03/13] update /api/users to parse json data

---
 api/user.go                     | 37 ++++++++++++++++-----------------
 static/resources/js/register.js |  5 +++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/api/user.go b/api/user.go
index 985edf1cb..16decb5f0 100644
--- a/api/user.go
+++ b/api/user.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
+	//	"strings"
 
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/models"
@@ -33,6 +33,14 @@ type UserAPI struct {
 	userID        int
 }
 
+type userReq struct {
+	UserName string `json:"username"`
+	Password string `json:"password"`
+	Realname string `json:"realname"`
+	Email    string `json:"email"`
+	Comment  string `json:"comment"`
+}
+
 const userNameMaxLen int = 20
 const passwordMaxLen int = 20
 const realNameMaxLen int = 20
@@ -130,20 +138,17 @@ func (ua *UserAPI) Put() { //currently only for toggle admin, so no request body
 
 // Post ...
 func (ua *UserAPI) Post() {
-	username := strings.TrimSpace(ua.GetString("username"))
-	password := strings.TrimSpace(ua.GetString("password"))
-	email := strings.TrimSpace(ua.GetString("email"))
-	realname := strings.TrimSpace(ua.GetString("realname"))
-	comment := strings.TrimSpace(ua.GetString("comment"))
+	var req userReq
+	ua.DecodeJSONReq(&req)
 
-	err := validateUserReq(ua)
+	err := validateUserReq(req)
 	if err != nil {
 		log.Errorf("Invalid user request, error: %v", err)
 		ua.RenderError(http.StatusBadRequest, "Invalid request for creating user")
 		return
 	}
 
-	user := models.User{Username: username, Email: email, Realname: realname, Password: password, Comment: comment}
+	user := models.User{Username: req.UserName, Email: req.Email, Realname: req.Realname, Password: req.Password, Comment: req.Comment}
 	exist, err := dao.UserExists(user, "email")
 	if err != nil {
 		log.Errorf("Error occurred in UserExists:", err)
@@ -186,8 +191,8 @@ func (ua *UserAPI) Delete() {
 	}
 }
 
-func validateUserReq(ua *UserAPI) error {
-	userName := ua.GetString("username")
+func validateUserReq(req userReq) error {
+	userName := req.UserName
 	if len(userName) == 0 {
 		return fmt.Errorf("User name can not be empty")
 	}
@@ -195,7 +200,7 @@ func validateUserReq(ua *UserAPI) error {
 		return fmt.Errorf("User name is too long")
 	}
 
-	password := ua.GetString("password")
+	password := req.Password
 	if len(password) == 0 {
 		return fmt.Errorf("Password can not be empty")
 	}
@@ -203,7 +208,7 @@ func validateUserReq(ua *UserAPI) error {
 		return fmt.Errorf("Password can is too long")
 	}
 
-	realName := ua.GetString("realname")
+	realName := req.Realname
 	if len(realName) == 0 {
 		return fmt.Errorf("Real name can not be empty")
 	}
@@ -211,16 +216,10 @@ func validateUserReq(ua *UserAPI) error {
 		return fmt.Errorf("Real name is too long")
 	}
 
-	email := ua.GetString("email")
+	email := req.Email
 	if len(email) == 0 {
 		return fmt.Errorf("Email can not be empty")
 	}
 
-	comments := ua.GetString("comment")
-	if len(comments) != 0 {
-		if len(comments) >= commentsMaxLen {
-			return fmt.Errorf("Comments is too long")
-		}
-	}
 	return nil
 }
diff --git a/static/resources/js/register.js b/static/resources/js/register.js
index 7f0b21d4a..7c4793d35 100644
--- a/static/resources/js/register.js
+++ b/static/resources/js/register.js
@@ -38,8 +38,9 @@ jQuery(function(){
 			var comment  = $.trim($("#Comment").val());
 			$.ajax({
 				url : "/api/users",
-				data:{username: username, password: password, realname: realname, comment: comment, email: email},
+				data: JSON.stringify({username: username, password: password, realname: realname, comment: comment, email: email}),
 				type: "POST",
+				contentType: "application/json; charset=UTF-8",
 				beforeSend: function(e){
 					$("#btnPageSignUp").prop("disabled", true);
 				},
@@ -55,7 +56,7 @@ jQuery(function(){
 							});
 					}
 				},
-				error:function(jqxhr, status, error){
+				error:function(xhr, status, error){
 					$("#dlgModal")
 							.dialogModal({
 								"title": i18n.getMessage("title_sign_up"), 

From fb918578992af0fe60cebe45082d3b32c411d536 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Tue, 5 Apr 2016 02:35:00 -0700
Subject: [PATCH 04/13] remove disabled import

---
 api/user.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/user.go b/api/user.go
index 16decb5f0..d20ef9363 100644
--- a/api/user.go
+++ b/api/user.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	//	"strings"
 
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/models"

From f54b942fd765713dc12c831111b59b85cfc03ea4 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Tue, 5 Apr 2016 02:45:47 -0700
Subject: [PATCH 05/13] fix log issue

---
 api/user.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/user.go b/api/user.go
index d20ef9363..4a8101ba8 100644
--- a/api/user.go
+++ b/api/user.go
@@ -150,7 +150,7 @@ func (ua *UserAPI) Post() {
 	user := models.User{Username: req.UserName, Email: req.Email, Realname: req.Realname, Password: req.Password, Comment: req.Comment}
 	exist, err := dao.UserExists(user, "email")
 	if err != nil {
-		log.Errorf("Error occurred in UserExists:", err)
+		log.Errorf("Error occurred in UserExists: %v", err)
 	}
 	if exist {
 		ua.RenderError(http.StatusConflict, "")
@@ -159,7 +159,7 @@ func (ua *UserAPI) Post() {
 
 	userID, err := dao.Register(user)
 	if err != nil {
-		log.Errorf("Error occurred in Register:", err)
+		log.Errorf("Error occurred in Register: %v", err)
 		ua.RenderError(http.StatusInternalServerError, "Internal error.")
 		return
 	}

From 5139952cb4cf4a92da87e1a18b7a3817be11f402 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Tue, 5 Apr 2016 03:01:04 -0700
Subject: [PATCH 06/13] update js error xhr to jQery xhr

---
 static/resources/js/register.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/resources/js/register.js b/static/resources/js/register.js
index 7c4793d35..72d28de86 100644
--- a/static/resources/js/register.js
+++ b/static/resources/js/register.js
@@ -56,7 +56,7 @@ jQuery(function(){
 							});
 					}
 				},
-				error:function(xhr, status, error){
+				error:function(jqxhr, status, error){
 					$("#dlgModal")
 							.dialogModal({
 								"title": i18n.getMessage("title_sign_up"), 

From b76acb638199fb1126b0c95ce4391e291bbda3b8 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Tue, 5 Apr 2016 20:26:24 -0700
Subject: [PATCH 07/13] remove validate step as the duplication, and user
 model.User instead of new struct.

---
 api/user.go    | 75 ++------------------------------------------------
 models/user.go | 10 +++----
 2 files changed, 8 insertions(+), 77 deletions(-)

diff --git a/api/user.go b/api/user.go
index 4a8101ba8..4e6136214 100644
--- a/api/user.go
+++ b/api/user.go
@@ -16,7 +16,6 @@
 package api
 
 import (
-	"fmt"
 	"net/http"
 	"strconv"
 
@@ -32,19 +31,6 @@ type UserAPI struct {
 	userID        int
 }
 
-type userReq struct {
-	UserName string `json:"username"`
-	Password string `json:"password"`
-	Realname string `json:"realname"`
-	Email    string `json:"email"`
-	Comment  string `json:"comment"`
-}
-
-const userNameMaxLen int = 20
-const passwordMaxLen int = 20
-const realNameMaxLen int = 20
-const commentsMaxLen int = 20
-
 // Prepare validates the URL and parms
 func (ua *UserAPI) Prepare() {
 
@@ -137,37 +123,15 @@ func (ua *UserAPI) Put() { //currently only for toggle admin, so no request body
 
 // Post ...
 func (ua *UserAPI) Post() {
-	var req userReq
-	ua.DecodeJSONReq(&req)
+	user := models.User{}
+	ua.DecodeJSONReq(&user)
 
-	err := validateUserReq(req)
-	if err != nil {
-		log.Errorf("Invalid user request, error: %v", err)
-		ua.RenderError(http.StatusBadRequest, "Invalid request for creating user")
-		return
-	}
-
-	user := models.User{Username: req.UserName, Email: req.Email, Realname: req.Realname, Password: req.Password, Comment: req.Comment}
-	exist, err := dao.UserExists(user, "email")
-	if err != nil {
-		log.Errorf("Error occurred in UserExists: %v", err)
-	}
-	if exist {
-		ua.RenderError(http.StatusConflict, "")
-		return
-	}
-
-	userID, err := dao.Register(user)
+	_, err := dao.Register(user)
 	if err != nil {
 		log.Errorf("Error occurred in Register: %v", err)
 		ua.RenderError(http.StatusInternalServerError, "Internal error.")
 		return
 	}
-	if userID == 0 {
-		log.Errorf("Error happened on registing new user in db.")
-		ua.RenderError(http.StatusInternalServerError, "Internal error.")
-	}
-
 }
 
 // Delete ...
@@ -189,36 +153,3 @@ func (ua *UserAPI) Delete() {
 		return
 	}
 }
-
-func validateUserReq(req userReq) error {
-	userName := req.UserName
-	if len(userName) == 0 {
-		return fmt.Errorf("User name can not be empty")
-	}
-	if len(userName) > userNameMaxLen {
-		return fmt.Errorf("User name is too long")
-	}
-
-	password := req.Password
-	if len(password) == 0 {
-		return fmt.Errorf("Password can not be empty")
-	}
-	if len(password) >= passwordMaxLen {
-		return fmt.Errorf("Password can is too long")
-	}
-
-	realName := req.Realname
-	if len(realName) == 0 {
-		return fmt.Errorf("Real name can not be empty")
-	}
-	if len(realName) >= realNameMaxLen {
-		return fmt.Errorf("Real name is too long")
-	}
-
-	email := req.Email
-	if len(email) == 0 {
-		return fmt.Errorf("Email can not be empty")
-	}
-
-	return nil
-}
diff --git a/models/user.go b/models/user.go
index 82b8bc221..29fb41c13 100644
--- a/models/user.go
+++ b/models/user.go
@@ -22,11 +22,11 @@ import (
 // User holds the details of a user.
 type User struct {
 	UserID       int    `orm:"column(user_id)" json:"UserId"`
-	Username     string `orm:"column(username)"`
-	Email        string `orm:"column(email)"`
-	Password     string `orm:"column(password)"`
-	Realname     string `orm:"column(realname)"`
-	Comment      string `orm:"column(comment)"`
+	Username     string `orm:"column(username)" json:"username"`
+	Email        string `orm:"column(email)" json:"email"`
+	Password     string `orm:"column(password)" json:"password"`
+	Realname     string `orm:"column(realname)" json:"realname"`
+	Comment      string `orm:"column(comment)" json:"comment"`
 	Deleted      int    `orm:"column(deleted)"`
 	Rolename     string
 	RoleID       int `json:"RoleId"`

From 943d6ebd4cb6849bddf9fcc7b3c70acf7d1c32a3 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Fri, 8 Apr 2016 00:25:52 -0700
Subject: [PATCH 08/13] merge code with api/user; refactor api/users

---
 api/user.go  | 67 ++++++++++++++++++++++++++++++++++------------------
 ui/router.go |  1 -
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/api/user.go b/api/user.go
index 4e6136214..ed433397a 100644
--- a/api/user.go
+++ b/api/user.go
@@ -17,7 +17,9 @@ package api
 
 import (
 	"net/http"
+	"os"
 	"strconv"
+	"strings"
 
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/models"
@@ -27,15 +29,32 @@ import (
 // UserAPI handles request to /api/users/{}
 type UserAPI struct {
 	BaseAPI
-	currentUserID int
-	userID        int
+	currentUserID    int
+	userID           int
+	SelfRegistration bool
+	IsAdmin          bool
+	AuthMode         string
 }
 
 // Prepare validates the URL and parms
 func (ua *UserAPI) Prepare() {
 
+	authMode := strings.ToLower(os.Getenv("AUTH_MODE"))
+	if authMode == "" {
+		authMode = "db_auth"
+	}
+	ua.AuthMode = authMode
+
+	selfRegistration := strings.ToLower(os.Getenv("SELF_REGISTRATION"))
+	if selfRegistration == "on" {
+		ua.SelfRegistration = true
+	}
+
 	if ua.Ctx.Input.IsPost() {
-		return
+		sessionUserID := ua.GetSession("userId")
+		if sessionUserID == nil {
+			return
+		}
 	}
 
 	ua.currentUserID = ua.ValidateUser()
@@ -60,18 +79,19 @@ func (ua *UserAPI) Prepare() {
 			ua.CustomAbort(http.StatusNotFound, "")
 		}
 	}
+
+	var err error
+	ua.IsAdmin, err = dao.IsAdminRole(ua.currentUserID)
+	if err != nil {
+		log.Errorf("Error occurred in IsAdminRole:%v", err)
+		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
+	}
 }
 
 // Get ...
 func (ua *UserAPI) Get() {
-	exist, err := dao.IsAdminRole(ua.currentUserID)
-	if err != nil {
-		log.Errorf("Error occurred in IsAdminRole, error: %v", err)
-		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
-	}
-
 	if ua.userID == 0 { //list users
-		if !exist {
+		if !ua.IsAdmin {
 			log.Errorf("Current user, id: %d does not have admin role, can not list users", ua.currentUserID)
 			ua.RenderError(http.StatusForbidden, "User does not have admin role")
 			return
@@ -89,7 +109,7 @@ func (ua *UserAPI) Get() {
 		}
 		ua.Data["json"] = userList
 
-	} else if ua.userID == ua.currentUserID || exist {
+	} else if ua.userID == ua.currentUserID || ua.IsAdmin {
 		userQuery := models.User{UserID: ua.userID}
 		u, err := dao.GetUser(userQuery)
 		if err != nil {
@@ -107,12 +127,7 @@ func (ua *UserAPI) Get() {
 
 // Put ...
 func (ua *UserAPI) Put() { //currently only for toggle admin, so no request body
-	exist, err := dao.IsAdminRole(ua.currentUserID)
-	if err != nil {
-		log.Errorf("Error occurred in IsAdminRole, error: %v", err)
-		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
-	}
-	if !exist {
+	if !ua.IsAdmin {
 		log.Warningf("current user, id: %d does not have admin role, can not update other user's role", ua.currentUserID)
 		ua.RenderError(http.StatusForbidden, "User does not have admin role")
 		return
@@ -123,6 +138,16 @@ func (ua *UserAPI) Put() { //currently only for toggle admin, so no request body
 
 // Post ...
 func (ua *UserAPI) Post() {
+
+	if !(ua.AuthMode == "db_auth") {
+		ua.CustomAbort(http.StatusForbidden, "")
+	}
+
+	if !(ua.SelfRegistration || ua.IsAdmin) {
+		log.Warning("Registration can only be used by admin role user when self-registration is off.")
+		ua.CustomAbort(http.StatusForbidden, "")
+	}
+
 	user := models.User{}
 	ua.DecodeJSONReq(&user)
 
@@ -136,16 +161,12 @@ func (ua *UserAPI) Post() {
 
 // Delete ...
 func (ua *UserAPI) Delete() {
-	exist, err := dao.IsAdminRole(ua.currentUserID)
-	if err != nil {
-		log.Errorf("Error occurred in IsAdminRole, error: %v", err)
-		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
-	}
-	if !exist {
+	if !ua.IsAdmin {
 		log.Warningf("current user, id: %d does not have admin role, can not remove user", ua.currentUserID)
 		ua.RenderError(http.StatusForbidden, "User does not have admin role")
 		return
 	}
+	var err error
 	err = dao.DeleteUser(ua.userID)
 	if err != nil {
 		log.Errorf("Failed to delete data from database, error: %v", err)
diff --git a/ui/router.go b/ui/router.go
index 1d7f15d03..a1f9067c1 100644
--- a/ui/router.go
+++ b/ui/router.go
@@ -32,7 +32,6 @@ func initRouters() {
 	beego.Router("/login", &controllers.CommonController{}, "post:Login")
 	beego.Router("/logout", &controllers.CommonController{}, "get:Logout")
 	beego.Router("/language", &controllers.CommonController{}, "get:SwitchLanguage")
-	//	beego.Router("/signUp", &controllers.CommonController{}, "post:SignUp")
 	beego.Router("/userExists", &controllers.CommonController{}, "post:UserExists")
 	beego.Router("/reset", &controllers.CommonController{}, "post:ResetPassword")
 	beego.Router("/sendEmail", &controllers.CommonController{}, "get:SendEmail")

From b404cdfe90d59c2f92fd39a980eb2badd5abefad Mon Sep 17 00:00:00 2001
From: Henry Zhang <haininghenryzh@vmware.com>
Date: Thu, 14 Apr 2016 15:57:42 +0800
Subject: [PATCH 09/13] update documents

---
 AUTHORS                    |   3 ++-
 README.md                  |   3 +++
 docs/configure_https.md    |  10 +++++++---
 docs/img/beegoLogo.png     | Bin 0 -> 5306 bytes
 docs/installation_guide.md |  13 ++++++++-----
 5 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 docs/img/beegoLogo.png

diff --git a/AUTHORS b/AUTHORS
index f6e2e7e0e..d292ef8c7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 # This file lists all individuals having contributed content to the repository.
 
+Alexander Zeitler <alexander.zeitler at pdmlab.com>
 Amanda Zhang <amzhang at vmware.com>
 Benniu Ji <benniuji at gmail.com>
 Bobby Zhang <junzhang at vmware.com>
@@ -9,8 +10,8 @@ Haining Henry Zhang <henryzhang at vmware.com>
 Hao Xia <haox at vmware.com>
 Jack Liu <ljack at vmware.com>
 Kun Wang <kunw at vmware.com>
+Peng Zhao<zhaopeng1988 at gmail.com>
 Shan Zhu <zhus at vmware.com>
 Victoria Zheng <vzheng at vmware.com>
 Wenkai Yin <yinw at vmware.com>
 Yan Wang <wangyan at vmware.com>
-
diff --git a/README.md b/README.md
index 88b93ad34..d94dd1b3c 100644
--- a/README.md
+++ b/README.md
@@ -68,3 +68,6 @@ Harbor is available under the [Apache 2 license](LICENSE).
 
 ### Users
 <a href="https://www.madailicai.com/" border="0" target="_blank"><img alt="MaDaiLiCai" src="docs/img/UserMaDai.jpg"></a>
+
+### Supporting Technologies
+Harbor is powered by <a href="https://www.beego.me/" border="0" target="_blank"><img alt="beego" src="docs/img/beegoLogo.png"></a>, an open source framework to build and develop applications in the Go way.
diff --git a/docs/configure_https.md b/docs/configure_https.md
index e366cb5d7..ccb667c35 100644
--- a/docs/configure_https.md
+++ b/docs/configure_https.md
@@ -1,8 +1,8 @@
-#Configure Harbor with HTTPS Access 
+#Configuring Harbor with HTTPS Access 
 
 Because Harbor does not ship with any certificates, it uses HTTP by default to serve registry requests. This makes it relatively simple to configure. However, it is highly recommended that security be enabled for any production environment. Harbor has an Nginx instance as a reverse proxy for all services, you can configure Nginx to enable https.
 
-##Get a certificate
+##Getting a certificate
 
 Assuming that your registry's **hostname** is **reg.yourdomain.com**, and that its DNS record points to the host where you are running Harbor. You first should get a certificate from a CA. The certificate usually contains a .crt file and a .key file, for example, **yourdomain.com.crt** and **yourdomain.com.key**.
 
@@ -22,7 +22,7 @@ In a test or development environment, you may choose to use a self-signed certif
 ```
 3) Generate the certificate of your registry host:
 
-You need to configure openssl first. On Ubuntu, the config file locates at /etc/ssl/openssl.cnf. Refer to openssl document for more information. The default CA directory of openssl is called demoCA. Let's create necessary directories and files:
+You need to configure openssl first. On Ubuntu, the config file locates at **/etc/ssl/openssl.cnf**. Refer to openssl document for more information. The default CA directory of openssl is called demoCA. Let's create necessary directories and files:
 ```
   mkdir demoCA
   cd demoCA
@@ -41,6 +41,10 @@ After obtaining the **yourdomain.com.crt** and **yourdomain.com.key** files, cha
   cd Deploy/config/nginx
 ```
 Create a new directory cert/, if it does not exist. Then copy **yourdomain.com.crt** and **yourdomain.com.key** to cert/.
+```
+  cp yourdomain.com.crt cert/
+  cp yourdomain.com.key cert/ 
+```
 
 Rename the existing configuration file of Nginx:
 ```
diff --git a/docs/img/beegoLogo.png b/docs/img/beegoLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cd801385d7c954d8d6881cdd36303177dc4c1e7
GIT binary patch
literal 5306
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
M07*qoM6N<$f&igDQUCw|

literal 0
HcmV?d00001

diff --git a/docs/installation_guide.md b/docs/installation_guide.md
index 1c4aa4bd4..6b17cc3b5 100644
--- a/docs/installation_guide.md
+++ b/docs/installation_guide.md
@@ -28,7 +28,7 @@ Before installing Harbor, you should configure the parameters in the file **harb
 At minimum, you need to change the **hostname** attribute in **harbor.cfg**. The description of each attribute is as follows:  
 
 **hostname**: The hostname for a user to access the user interface and the registry service. It should be the IP address or the fully qualified domain name (FQDN) of your target machine, for example 192.168.1.10 or reg.yourdomain.com . Do NOT use localhost or 127.0.0.1 for the hostname because the registry service needs to be accessed by external clients.  
-**ui_url_protocol**: The protocol for accessing the user interface and the token/notification service, by default it is http.  
+**ui_url_protocol**: The protocol for accessing the user interface and the token/notification service, by default it is http. To set up https protocol, refer to [Configuring Harbor with HTTPS](configure_https.md).  
 **Email settings**: the following 5 attributes are used to send an email to reset a user's password,  they are not mandatory unless the password reset function is needed in Harbor.  
 * email_server = smtp.mydomain.com 
 * email_server_port = 25
@@ -40,8 +40,9 @@ At minimum, you need to change the **hostname** attribute in **harbor.cfg**. The
 **auth_mode**: The authentication mode of Harbor. By default it is *db_auth*, i.e. the credentials are stored in a database. Please set it to *ldap_auth* if you want to verify user's credentials against an LDAP server.  
 **ldap_url**: The URL for LDAP endpoint, for example ldaps://ldap.mydomain.com. It is only used when **auth_mode** is set to *ldap_auth*.    
 **ldap_basedn**: The basedn template for verifying the user's credentials against LDAP, for example uid=%s,ou=people,dc=mydomain,dc=com.  It is only used when **auth_mode** is set to *ldap_auth*.  
-**db_password**: The password of root user of mySQL database.  
+**db_password**: The password of root user of mySQL database. Change this password for any production use.  
 **self_registration**: The flag to turn on or off the user self-registration function. If this flag is turned off, only an admin user can create new users in Harbor. The default value is on. 
+NOTE: When **auth_mode** is *ldap_auth*, the self-registration feature is always disabled, therefore, this flag is ignored.  
 
 #### Building and starting Harbor
 After configuring harbor.cfg, build and start Harbor by the following commands. Because it requires downloading necessary files from the Internet, it may take a while for the docker-compose process to finish.  
@@ -61,7 +62,7 @@ After configuring harbor.cfg, build and start Harbor by the following commands.
 
 If everything works fine, you can open a browser to visit the admin portal at http://reg.yourdomain.com . The default administrator username and password are admin/Harbor12345 .
 
-Create a new project, e.g. myproject, in the admin portal. You can then use docker commands to login and push images. The default port of Harbor registry server is 80:
+Log in to the admin portal and create a new project, e.g. myproject. You can then use docker commands to login and push images. The default port of Harbor registry server is 80:
 ```sh
 $ docker login reg.yourdomain.com
 $ docker push reg.yourdomain.com/myproject/myrepo
@@ -121,8 +122,10 @@ $ cd ../
 $ tar -cvzf harbor_offline-0.1.1.tgz harbor
 ```
 
-The file **harbor_offline-0.1.1.tgz** contains the images saved by previously steps and the files required to start Harbor.
-You can use tools such as scp to transfer the file **harbor_offline-0.1.1.tgz** to the target machine that does not have Internet connection. On the target machine, you can execute the following commands to start Harbor. Again, before running the **prepare** script, be sure to update **harbor.cfg** to reflect the right configuration of the target machine. (Refer to Section [Configure Harbor](#configuring-harbor) .)
+The file **harbor_offline-0.1.1.tgz** contains the images saved by previous steps and the other files required to start Harbor.
+You can use tools such as scp to transfer the file **harbor_offline-0.1.1.tgz** to the target machine that does not have Internet connection. 
+On the target machine, you can execute the following commands to start Harbor. Again, before running the **prepare** script, 
+be sure to update **harbor.cfg** to reflect the right configuration of the target machine. (Refer to Section [Configuring Harbor](#configuring-harbor) .)
 ```
 $ tar -xzvf harbor_offline-0.1.1.tgz  
 $ cd harbor  

From a9a12bacfab0298b63b6d29a5eeceee2bba039a8 Mon Sep 17 00:00:00 2001
From: Henry Zhang <haininghenryzh@vmware.com>
Date: Thu, 14 Apr 2016 17:27:09 +0800
Subject: [PATCH 10/13] update document

---
 README.md                  |   4 ++--
 docs/configure_https.md    |   2 +-
 docs/img/beegoLogo.png     | Bin 5306 -> 4015 bytes
 docs/installation_guide.md |   4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d94dd1b3c..64df2368e 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ The host must be connected to the Internet.
 
 If everything works fine, you can open a browser to visit the admin portal at http://reg.yourdomain.com . The default administrator username and password are admin/Harbor12345 .
 
-Create a new project, e.g. myproject, in the admin portal. You can then use docker commands to login and push images. The default port of Harbor registry server is 80:
+Log in to the admin portal and create a new project, e.g. myproject. You can then use docker commands to login and push images. The default port of Harbor registry server is 80:
 ```sh
 $ docker login reg.yourdomain.com
 $ docker push reg.yourdomain.com/myproject/myrepo
@@ -70,4 +70,4 @@ Harbor is available under the [Apache 2 license](LICENSE).
 <a href="https://www.madailicai.com/" border="0" target="_blank"><img alt="MaDaiLiCai" src="docs/img/UserMaDai.jpg"></a>
 
 ### Supporting Technologies
-Harbor is powered by <a href="https://www.beego.me/" border="0" target="_blank"><img alt="beego" src="docs/img/beegoLogo.png"></a>, an open source framework to build and develop applications in the Go way.
+<img alt="beego" src="docs/img/beegoLogo.png"> Harbor is powered by <a href="http://beego.me/">Beego</a>, an open source framework to build and develop applications in the Go way.
diff --git a/docs/configure_https.md b/docs/configure_https.md
index ccb667c35..003fcfd6a 100644
--- a/docs/configure_https.md
+++ b/docs/configure_https.md
@@ -40,7 +40,7 @@ After obtaining the **yourdomain.com.crt** and **yourdomain.com.key** files, cha
 ```
   cd Deploy/config/nginx
 ```
-Create a new directory cert/, if it does not exist. Then copy **yourdomain.com.crt** and **yourdomain.com.key** to cert/.
+Create a new directory cert/, if it does not exist. Then copy **yourdomain.com.crt** and **yourdomain.com.key** to cert/, e.g. :
 ```
   cp yourdomain.com.crt cert/
   cp yourdomain.com.key cert/ 
diff --git a/docs/img/beegoLogo.png b/docs/img/beegoLogo.png
index 4cd801385d7c954d8d6881cdd36303177dc4c1e7..ada97519d27f5cd1ca4cf3fc9ffb1ec87a47aae4 100644
GIT binary patch
delta 3912
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
Woy;c1_s;tO0000<MNUMnLSTZ?E0ehZ

delta 5213
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
Xh6<BdXq61h00000NkvXXu0mjfWC<>#

diff --git a/docs/installation_guide.md b/docs/installation_guide.md
index 6b17cc3b5..56d0c5152 100644
--- a/docs/installation_guide.md
+++ b/docs/installation_guide.md
@@ -28,7 +28,7 @@ Before installing Harbor, you should configure the parameters in the file **harb
 At minimum, you need to change the **hostname** attribute in **harbor.cfg**. The description of each attribute is as follows:  
 
 **hostname**: The hostname for a user to access the user interface and the registry service. It should be the IP address or the fully qualified domain name (FQDN) of your target machine, for example 192.168.1.10 or reg.yourdomain.com . Do NOT use localhost or 127.0.0.1 for the hostname because the registry service needs to be accessed by external clients.  
-**ui_url_protocol**: The protocol for accessing the user interface and the token/notification service, by default it is http. To set up https protocol, refer to [Configuring Harbor with HTTPS](configure_https.md).  
+**ui_url_protocol**: The protocol for accessing the user interface and the token/notification service, by default it is http. To set up the https protocol, refer to [Configuring Harbor with HTTPS Access](configure_https.md).  
 **Email settings**: the following 5 attributes are used to send an email to reset a user's password,  they are not mandatory unless the password reset function is needed in Harbor.  
 * email_server = smtp.mydomain.com 
 * email_server_port = 25
@@ -97,7 +97,7 @@ $ sudo docker-compose up -d
 ......
 ```
 
-### Deploying Harbor to a target machine that does not have Internet access
+### Deploying Harbor to a host which does not have Internet access
 When you run *docker-compose up* to start Harbor, it will pull base images from Docker Hub and build new images for the containers. This process requires accessing the Internet. If you want to deploy Harbor to a host that is not connected to the Internet, you need to prepare Harbor on a machine that has access to the Internet. After that, you export the images as tgz files and transfer them to the target machine. Then load the tgz file into Docker's local image repo.
 
 #### Building and saving images for offline installation

From c66edd02d074b3339cd7b2619e6df53ecf7cd2aa Mon Sep 17 00:00:00 2001
From: Henry Zhang <haininghenryzh@vmware.com>
Date: Thu, 14 Apr 2016 17:40:03 +0800
Subject: [PATCH 11/13] update docs

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index d292ef8c7..8e9802ff4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,7 +10,7 @@ Haining Henry Zhang <henryzhang at vmware.com>
 Hao Xia <haox at vmware.com>
 Jack Liu <ljack at vmware.com>
 Kun Wang <kunw at vmware.com>
-Peng Zhao<zhaopeng1988 at gmail.com>
+Peng Zhao <zhaopeng1988 at gmail.com>
 Shan Zhu <zhus at vmware.com>
 Victoria Zheng <vzheng at vmware.com>
 Wenkai Yin <yinw at vmware.com>

From 7165156f2d935a879859770bda8b4611ad252864 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Thu, 14 Apr 2016 21:33:48 -0700
Subject: [PATCH 12/13] update per comments, add support for basic auth

---
 api/user.go                     | 21 ++++++++++++++++-----
 controllers/register.go         | 28 ----------------------------
 static/resources/js/register.js | 33 +++++++++++++++------------------
 3 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/api/user.go b/api/user.go
index ed433397a..d4c0c1851 100644
--- a/api/user.go
+++ b/api/user.go
@@ -29,11 +29,14 @@ import (
 // UserAPI handles request to /api/users/{}
 type UserAPI struct {
 	BaseAPI
-	currentUserID    int
-	userID           int
-	SelfRegistration bool
-	IsAdmin          bool
-	AuthMode         string
+	currentUserID       int
+	userID              int
+	SelfRegistration    bool
+	IsAdmin             bool
+	AuthMode            string
+	IsBasicAuth         bool
+	UserNameInBasicAuth string
+	PasswordInBasicAuth string
 }
 
 // Prepare validates the URL and parms
@@ -51,6 +54,8 @@ func (ua *UserAPI) Prepare() {
 	}
 
 	if ua.Ctx.Input.IsPost() {
+		ua.UserNameInBasicAuth, ua.PasswordInBasicAuth, ua.IsBasicAuth = ua.Ctx.Request.BasicAuth()
+
 		sessionUserID := ua.GetSession("userId")
 		if sessionUserID == nil {
 			return
@@ -151,12 +156,18 @@ func (ua *UserAPI) Post() {
 	user := models.User{}
 	ua.DecodeJSONReq(&user)
 
+	if ua.IsBasicAuth {
+		user.Username = ua.UserNameInBasicAuth
+		user.Password = ua.PasswordInBasicAuth
+	}
+
 	_, err := dao.Register(user)
 	if err != nil {
 		log.Errorf("Error occurred in Register: %v", err)
 		ua.RenderError(http.StatusInternalServerError, "Internal error.")
 		return
 	}
+
 }
 
 // Delete ...
diff --git a/controllers/register.go b/controllers/register.go
index dd1a80eab..d8ed05715 100644
--- a/controllers/register.go
+++ b/controllers/register.go
@@ -17,7 +17,6 @@ package controllers
 
 import (
 	"net/http"
-	"strings"
 
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/models"
@@ -65,33 +64,6 @@ func (ac *AddUserController) Get() {
 	}
 }
 
-// SignUp insert data into DB based on data in form.
-func (cc *CommonController) SignUp() {
-
-	if !(cc.AuthMode == "db_auth") {
-		cc.CustomAbort(http.StatusForbidden, "")
-	}
-
-	if !(cc.SelfRegistration || cc.IsAdmin) {
-		log.Warning("Registration can only be used by admin role user when self-registration is off.")
-		cc.CustomAbort(http.StatusForbidden, "")
-	}
-
-	username := strings.TrimSpace(cc.GetString("username"))
-	email := strings.TrimSpace(cc.GetString("email"))
-	realname := strings.TrimSpace(cc.GetString("realname"))
-	password := strings.TrimSpace(cc.GetString("password"))
-	comment := strings.TrimSpace(cc.GetString("comment"))
-
-	user := models.User{Username: username, Email: email, Realname: realname, Password: password, Comment: comment}
-
-	_, err := dao.Register(user)
-	if err != nil {
-		log.Errorf("Error occurred in Register: %v", err)
-		cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
-	}
-}
-
 // UserExists checks if user exists when user input value in sign in form.
 func (cc *CommonController) UserExists() {
 	target := cc.GetString("target")
diff --git a/static/resources/js/register.js b/static/resources/js/register.js
index ebfe60dd0..8f970946f 100644
--- a/static/resources/js/register.js
+++ b/static/resources/js/register.js
@@ -38,15 +38,25 @@ jQuery(function(){
             var comment  = $.trim($("#Comment").val());
             var isAdmin = $("#isAdmin").val();
             
-			$.ajax({
+			new AjaxUtil({
 				url : "/api/users",
-				data: JSON.stringify({username: username, password: password, realname: realname, comment: comment, email: email}),
+				data: {"username": username, "password": password, "realname": realname, "comment": comment, "email": email},
 				type: "POST",
-				contentType: "application/json; charset=UTF-8",
 				beforeSend: function(e){
 					$("#btnPageSignUp").prop("disabled", true);
 				},
-				success: function(data, status, xhr){
+				error:function(jqxhr, status, error){
+					$("#dlgModal")
+							.dialogModal({
+								"title": i18n.getMessage("title_sign_up"), 
+								"content": i18n.getMessage("internal_error"),
+								"callback": function(){ 								
+									return;
+								}
+							});
+				},
+				complete: function(xhr, status){
+					$("#btnPageSignUp").prop("disabled", false);
 					if(xhr && xhr.status == 200){
 						$("#dlgModal")
 							.dialogModal({
@@ -61,21 +71,8 @@ jQuery(function(){
 								}
 							});
 					}
-				},
-				error:function(jqxhr, status, error){
-					$("#dlgModal")
-							.dialogModal({
-								"title": i18n.getMessage("title_sign_up"), 
-								"content": i18n.getMessage("internal_error"),
-								"callback": function(){ 								
-									return;
-								}
-							});
-				},
-				complete: function(){
-					$("#btnPageSignUp").prop("disabled", false);
 				}
-			});
+			}).exec();
 		});
 	});
 });
\ No newline at end of file

From fc24341c1730ffe6d60c9a8587ed8a44affb7c50 Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan_0219@hotmail.com>
Date: Fri, 15 Apr 2016 01:55:33 -0700
Subject: [PATCH 13/13] update per comments, add support for basic auth

---
 api/user.go | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/api/user.go b/api/user.go
index d4c0c1851..58aa29ec3 100644
--- a/api/user.go
+++ b/api/user.go
@@ -29,14 +29,11 @@ import (
 // UserAPI handles request to /api/users/{}
 type UserAPI struct {
 	BaseAPI
-	currentUserID       int
-	userID              int
-	SelfRegistration    bool
-	IsAdmin             bool
-	AuthMode            string
-	IsBasicAuth         bool
-	UserNameInBasicAuth string
-	PasswordInBasicAuth string
+	currentUserID    int
+	userID           int
+	SelfRegistration bool
+	IsAdmin          bool
+	AuthMode         string
 }
 
 // Prepare validates the URL and parms
@@ -54,10 +51,9 @@ func (ua *UserAPI) Prepare() {
 	}
 
 	if ua.Ctx.Input.IsPost() {
-		ua.UserNameInBasicAuth, ua.PasswordInBasicAuth, ua.IsBasicAuth = ua.Ctx.Request.BasicAuth()
-
 		sessionUserID := ua.GetSession("userId")
-		if sessionUserID == nil {
+		_, _, ok := ua.Ctx.Request.BasicAuth()
+		if sessionUserID == nil && !ok {
 			return
 		}
 	}
@@ -91,6 +87,7 @@ func (ua *UserAPI) Prepare() {
 		log.Errorf("Error occurred in IsAdminRole:%v", err)
 		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
 	}
+
 }
 
 // Get ...
@@ -156,11 +153,6 @@ func (ua *UserAPI) Post() {
 	user := models.User{}
 	ua.DecodeJSONReq(&user)
 
-	if ua.IsBasicAuth {
-		user.Username = ua.UserNameInBasicAuth
-		user.Password = ua.PasswordInBasicAuth
-	}
-
 	_, err := dao.Register(user)
 	if err != nil {
 		log.Errorf("Error occurred in Register: %v", err)