Merge pull request #884 from floatdrop/master

Allow to read logs for public repo in ws

server/handler/ws.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"database/sql"
 	"log"
 	"net/http"
 	"strconv"
@@ -65,14 +66,15 @@ func WsUser(c web.C, w http.ResponseWriter, r *http.Request) {
 					break
 				}
 
-				// user must have read access to the repository
+				role, permerr := datastore.GetPerm(ctx, user, work.Repo)
-				// in order to pass this message along
+				if permerr != nil && permerr != sql.ErrNoRows {
-				if role, err := datastore.GetPerm(ctx, user, work.Repo); err != nil || role.Read == false {
+					// for debugging
-					if err != nil {
+					log.Printf("WS: Error getting permissions for repository %s. Error: %s\n", work.Repo.Name, permerr)
-						log.Printf("WS: Error getting permissions for repository %s. Error: %s\n", work.Repo.Name, err)
-					} else {
-						log.Printf("WS: No read access for repository %s\n", work.Repo.Name)
 				}
+
+				// user must have read access to private the repository
+				// in order to pass this message along
+				if work.Repo.Private == true && role.Read == false {
 					break
 				}