From 38fc85d6191b5cc948c26a8ae25829142bff52e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 2 May 2015 12:30:53 +0200
Subject: [PATCH] Final tweaks to auth proxy feature

---
 conf/defaults.ini             |  2 +-
 conf/sample.ini               |  7 +++++++
 pkg/middleware/auth_proxy.go  |  4 +++-
 pkg/services/sqlstore/user.go | 10 +++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 88218240bac..b0a085dd991 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -164,7 +164,7 @@ allowed_domains =
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
-enabled = false;
+enabled = false
 header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
diff --git a/conf/sample.ini b/conf/sample.ini
index aa333cdc5de..e86846da232 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -161,6 +161,13 @@
 ;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;allowed_domains =
 
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+
 #################################### Logging ##########################
 [log]
 # Either "console", "file", default is "console"
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index d735779f694..42cd91a3ad1 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -12,7 +12,7 @@ func initContextWithAuthProxy(ctx *Context) bool {
 	}
 
 	proxyHeaderValue := ctx.Req.Header.Get(setting.AuthProxyHeaderName)
-	if len(proxyHeaderValue) <= 0 {
+	if len(proxyHeaderValue) == 0 {
 		return false
 	}
 
@@ -34,6 +34,8 @@ func initContextWithAuthProxy(ctx *Context) bool {
 				ctx.Handle(500, "Failed find user after creation", err)
 				return true
 			}
+		} else {
+			return false
 		}
 	}
 
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index c2092e963f8..663496427ba 100644
--- a/pkg/services/sqlstore/user.go
+++ b/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 on org.id = u.org_id `
 
+	sess := x.Table("user")
 	if query.UserId > 0 {
-		rawSql += "WHERE u.id=?"
+		sess.Sql(rawSql+"WHERE u.id=?", query.UserId)
 	} else if query.Login != "" {
-		rawSql += "WHERE u.login=?"
+		sess.Sql(rawSql+"WHERE u.login=?", query.Login)
 	} else if query.Email != "" {
-		rawSql += "WHERE u.email=?"
+		sess.Sql(rawSql+"WHERE u.email=?", query.Email)
 	}
 
 	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 {
 		return err
 	} else if !has {