Browse Source

ssh push support

Lunny Xiao 11 years ago
parent
commit
bbf5345004
3 changed files with 8 additions and 6 deletions
  1. 3 1
      models/models.go
  2. 1 1
      routers/repo/repo.go
  3. 4 4
      serve.go

+ 3 - 1
models/models.go

@@ -76,7 +76,9 @@ func setEngine() {
 
 	//x.ShowDebug = true
 	//orm.ShowErr = true
-	//x.ShowSQL = true
+	f, _ := os.Create("xorm.log")
+	orm.Logger = f
+	orm.ShowSQL = true
 
 	//log.Trace("Initialized database -> %s", dbName)
 

+ 1 - 1
routers/repo/repo.go

@@ -23,7 +23,7 @@ func Create(req *http.Request, r render.Render) {
 	}
 
 	// TODO: access check
-	fmt.Println(req.FormValue("userId"), req.FormValue("name"))
+	//fmt.Println(req.FormValue("userId"), req.FormValue("name"))
 
 	id, err := strconv.ParseInt(req.FormValue("userId"), 10, 64)
 	if err == nil {

+ 4 - 4
serve.go

@@ -81,23 +81,23 @@ func runServ(*cli.Context) {
 
 	switch {
 	case isWrite:
-		has, err := models.HasAccess(user.Name, repoName, COMMANDS_WRITE[verb])
+		has, err := models.HasAccess(user.Name, repoName, models.AU_WRITABLE)
 		if err != nil {
 			println("Inernel error:", err)
 			return
 		}
 		if !has {
-			println("You have no right to access this repository")
+			println("You have no right to write this repository")
 			return
 		}
 	case isRead:
-		has, err := models.HasAccess(user.Name, repoName, COMMANDS_READONLY[verb])
+		has, err := models.HasAccess(user.Name, repoName, models.AU_READABLE)
 		if err != nil {
 			println("Inernel error")
 			return
 		}
 		if !has {
-			has, err = models.HasAccess(user.Name, repoName, COMMANDS_WRITE[verb])
+			has, err = models.HasAccess(user.Name, repoName, models.AU_WRITABLE)
 			if err != nil {
 				println("Inernel error")
 				return