Final tweaks to auth proxy feature

conf/defaults.ini

@@ -164,7 +164,7 @@ allowed_domains =
 
 
 #################################### Auth Proxy ##########################
 #################################### Auth Proxy ##########################
 [auth.proxy]
 [auth.proxy]
-enabled = false;
+enabled = false
 header_name = X-WEBAUTH-USER
 header_name = X-WEBAUTH-USER
 header_property = username
 header_property = username
 auto_sign_up = true
 auto_sign_up = true

conf/sample.ini

@@ -161,6 +161,13 @@
 ;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;allowed_domains =
 ;allowed_domains =
 
 
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+
 #################################### Logging ##########################
 #################################### Logging ##########################
 [log]
 [log]
 # Either "console", "file", default is "console"
 # Either "console", "file", default is "console"

pkg/middleware/auth_proxy.go

@@ -12,7 +12,7 @@ func initContextWithAuthProxy(ctx *Context) bool {
 	}
 	}
 
 
 	proxyHeaderValue := ctx.Req.Header.Get(setting.AuthProxyHeaderName)
 	proxyHeaderValue := ctx.Req.Header.Get(setting.AuthProxyHeaderName)
-	if len(proxyHeaderValue) <= 0 {
+	if len(proxyHeaderValue) == 0 {
 		return false
 		return false
 	}
 	}
 
 
@@ -34,6 +34,8 @@ func initContextWithAuthProxy(ctx *Context) bool {
 				ctx.Handle(500, "Failed find user after creation", err)
 				ctx.Handle(500, "Failed find user after creation", err)
 				return true
 				return true
 			}
 			}
+		} else {
+			return false
 		}
 		}
 	}
 	}
 
 

pkg/services/sqlstore/user.go

@@ -265,17 +265,17 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
 									LEFT OUTER JOIN org_user on org_user.org_id = u.org_id and org_user.user_id = u.id
 									LEFT OUTER JOIN org_user on org_user.org_id = u.org_id and org_user.user_id = u.id
 	                LEFT OUTER JOIN org on org.id = u.org_id `
 	                LEFT OUTER JOIN org on org.id = u.org_id `
 
 
+	sess := x.Table("user")
 	if query.UserId > 0 {
 	if query.UserId > 0 {
-		rawSql += "WHERE u.id=?"
+		sess.Sql(rawSql+"WHERE u.id=?", query.UserId)
 	} else if query.Login != "" {
 	} else if query.Login != "" {
-		rawSql += "WHERE u.login=?"
+		sess.Sql(rawSql+"WHERE u.login=?", query.Login)
 	} else if query.Email != "" {
 	} else if query.Email != "" {
-		rawSql += "WHERE u.email=?"
+		sess.Sql(rawSql+"WHERE u.email=?", query.Email)
 	}
 	}
 
 
 	var user m.SignedInUser
 	var user m.SignedInUser
-	sess := x.Table("user")
-	has, err := sess.Sql(rawSql, query.UserId).Get(&user)
+	has, err := sess.Get(&user)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	} else if !has {
 	} else if !has {