Merge pull request cbonello#7 from iassic/replace/glogWithRevelLogs

replacing calls to glog with revel.TRACE

Next release of revel is supposed to use glob (see https://github.com/robfig/revel/tree/v1). That's why we moved from revel.TRACE to glob about 3 months ago. But v1 is still in development... We'll move back to glob when v1 is released.

Author: cbonello

csrf.go

@@ -5,7 +5,6 @@ package csrf
 
 import (
 	"crypto/subtle"
-	"github.com/golang/glog"
 	"github.com/robfig/revel"
 	"net/url"
 	"regexp"
@@ -36,13 +35,13 @@ var CSRFFilter = func(c *revel.Controller, fc []revel.Filter) {
 		realToken = generateNewToken(c)
 	} else {
 		realToken = tokenCookie
-		glog.V(2).Infof("REVEL-CSRF: Session's token: '%s'", realToken)
+		revel.TRACE.Printf("REVEL-CSRF: Session's token: '%s'\n", realToken)
 		if len(realToken) != lengthCSRFToken {
 			// Wrong length; token has either been tampered with, we're migrating
 			// onto a new algorithm for generating tokens, or a new session has
 			// been initiated. In any case, a new token is generated and the
 			// error will be detected later.
-			glog.V(2).Infof("REVEL_CSRF: Bad token length: found %d, expected %d",
+			revel.TRACE.Printf("REVEL_CSRF: Bad token length: found %d, expected %d",
 				len(realToken), lengthCSRFToken)
 			realToken = generateNewToken(c)
 		}
@@ -53,7 +52,7 @@ var CSRFFilter = func(c *revel.Controller, fc []revel.Filter) {
 	// See http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods
 	unsafeMethod := !safeMethods.MatchString(r.Method)
 	if unsafeMethod && !IsExempted(r.URL.Path) {
-		glog.V(2).Infof("REVEL-CSRF: Processing unsafe '%s' method...", r.Method)
+		revel.TRACE.Printf("REVEL-CSRF: Processing unsafe '%s' method...", r.Method)
 		if r.URL.Scheme == "https" {
 			// See [OWASP]; Checking the Referer Header.
 			referer, err := url.Parse(r.Header.Get("Referer"))
@@ -81,7 +80,7 @@ var CSRFFilter = func(c *revel.Controller, fc []revel.Filter) {
 			// Get CSRF token from form.
 			sentToken = c.Params.Get(fieldName)
 		}
-		glog.V(2).Infof("REVEL-CSRF: Token received from client: '%s'", sentToken)
+		revel.TRACE.Printf("REVEL-CSRF: Token received from client: '%s'", sentToken)
 
 		if len(sentToken) != len(realToken) {
 			c.Result = c.Forbidden(errBadToken)
@@ -92,7 +91,7 @@ var CSRFFilter = func(c *revel.Controller, fc []revel.Filter) {
 			c.Result = c.Forbidden(errBadToken)
 			return
 		}
-		glog.V(2).Infoln("REVEL-CSRF: Token successfully checked.")
+		revel.TRACE.Println("REVEL-CSRF: Token successfully checked.")
 	}
 
 	fc[0](c, fc[1:])

exemptions.go

@@ -5,9 +5,10 @@ package csrf
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	pathPackage "path"
 	"sync"
+
+	"github.com/robfig/revel"
 )
 
 // I'm not cetain that we need a mutex because exempted routes are generally
@@ -34,7 +35,7 @@ func IsExempted(path string) bool {
 	_, found := exemptionsFullPath.list[path]
 	exemptionsFullPath.RUnlock()
 	if found {
-		glog.V(2).Infof("REVEL-CSRF: Ignoring exempted route '%s'...", path)
+		revel.TRACE.Printf("REVEL-CSRF: Ignoring exempted route '%s'...\n", path)
 		return true
 	}
 
@@ -47,7 +48,7 @@ func IsExempted(path string) bool {
 			panic(fmt.Sprintf("REVEL-CSRF: malformed glob pattern: %#v", err))
 		}
 		if found {
-			glog.V(2).Infof("REVEL-CSRF: Ignoring exempted route '%s'...", path)
+			revel.TRACE.Printf("REVEL-CSRF: Ignoring exempted route '%s'...", path)
 			return true
 		}
 	}
@@ -56,7 +57,7 @@ func IsExempted(path string) bool {
 
 // ExemptedFullPath exempts one exact path from CSRF checks.
 func ExemptedFullPath(path string) {
-	glog.V(2).Infof("REVEL-CSRF: Adding exemption '%s'...", path)
+	revel.TRACE.Printf("REVEL-CSRF: Adding exemption '%s'...\n", path)
 	exemptionsFullPath.Lock()
 	exemptionsFullPath.list[path] = struct{}{}
 	exemptionsFullPath.Unlock()
@@ -72,7 +73,7 @@ func ExemptedFullPaths(paths ...string) {
 // ExemptedGlob exempts one path from CSRF checks using pattern matching.
 // See http://golang.org/pkg/path/#Match
 func ExemptedGlob(path string) {
-	glog.V(2).Infof("REVEL-CSRF: Adding exemption GLOB '%s'...", path)
+	revel.TRACE.Printf("REVEL-CSRF: Adding exemption GLOB '%s'...\n", path)
 	exemptionsGlobs.Lock()
 	exemptionsGlobs.list = append(exemptionsGlobs.list, path)
 	exemptionsGlobs.Unlock()

tokengen.go

@@ -5,7 +5,6 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"github.com/golang/glog"
 	"github.com/robfig/revel"
 	"io"
 )
@@ -24,7 +23,7 @@ func generateNewToken(c *revel.Controller) (token string) {
 	// Due to base64 encoding, CSRF tokens cannot have null bytes and therefore
 	// can safely be used as session values in Revel.
 	token = base64.StdEncoding.EncodeToString(bytes)
-	glog.V(2).Infof("REVEL-CSRF: Generated new Token: '%s'", token)
+	revel.TRACE.Printf("REVEL-CSRF: Generated new Token: '%s'\n", token)
 	c.Session[cookieName] = token
 	return
 }