From 916cc1a5e979bca34f3cc349e82c60cfdaa3b705 Mon Sep 17 00:00:00 2001
From: Hugo <hnouts.dev@gmail.com>
Date: Tue, 9 Feb 2021 10:53:13 +0100
Subject: [PATCH] upping log level from debug to info
---
main.go | 77 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 42 insertions(+), 35 deletions(-)
diff --git a/main.go b/main.go
index 4156210..99449ae 100644
--- a/main.go
+++ b/main.go
@@ -105,31 +105,31 @@ func logRoute(key string) {
// format is : Subject - action - location - description
switch key {
case "Ping_enedis_new_auth":
- log.Debug("Enedis - Received - Authorize - new /auth request from Cozy")
+ log.Info("Enedis - Received - Authorize - new /auth request from Cozy")
case "Ping_enedis_redirect":
- log.Debug("Enedis - Received - Redirect")
+ log.Info("Enedis - Received - Redirect")
case "Ping_enedis_new_token":
- log.Debug("Enedis - Received - Token - new /token request from Cozy")
+ log.Info("Enedis - Received - Token - new /token request from Cozy")
case "Ping_enedis_oauth_token":
- log.Debug("Enedis - Received - Token - an oauth token request from Cozy")
+ log.Info("Enedis - Received - Token - an oauth token request from Cozy")
case "Ping_enedis_refresh":
- log.Debug("Enedis - Received - Token - a refresh token request from Cozy")
+ log.Info("Enedis - Received - Token - a refresh token request from Cozy")
case "Ping_grdf_new_auth":
- log.Debug("Grdf - Received - Authorize - new /auth request from Cozy")
+ log.Info("Grdf - Received - Authorize - new /auth request from Cozy")
case "Ping_grdf_redirect":
- log.Debug("Grdf - Received - Redirect")
+ log.Info("Grdf - Received - Redirect")
case "Ping_grdf_new_token":
- log.Debug("Grdf - Received - Token - new /token request from Cozy")
+ log.Info("Grdf - Received - Token - new /token request from Cozy")
case "Enedis_success_oauth":
- log.Debug("Enedis - Success - Oauth - oauth dance successfully done")
+ log.Info("Enedis - Success - Oauth - oauth dance successfully done")
case "Enedis_success_token":
- log.Debug("Enedis - Success - Token - Enedis gave a new token or refresh token to the cozy stack")
+ log.Info("Enedis - Success - Token - Enedis gave a new token or refresh token to the cozy stack")
case "Grdf_success":
- log.Debug("Grdf - Success - Oauth - oauth dance successfully done")
+ log.Info("Grdf - Success - Oauth - oauth dance successfully done")
case "Grdf_success_token":
- log.Debug("Grdf - Success - Token - Grdf gave a new token to the cozy stack")
+ log.Info("Grdf - Success - Token - Grdf gave a new token to the cozy stack")
case "Enedis_error":
log.Error("Enedis - Error - Oauth - something wrong happened with enedis")
@@ -169,7 +169,7 @@ func logRoute(key string) {
log.Error("Cozy - Error - Grdf - Authorize")
default:
- log.Debug("logRoute was called with unknown arguments")
+ log.Info("logRoute was called with unknown arguments")
}
}
@@ -213,7 +213,8 @@ func main() {
mux.HandleFunc("/auth", func(w http.ResponseWriter, r *http.Request) {
logRoute("Ping_enedis_new_auth")
query := r.URL.Query()
- log.Debug("WL - EnedisReceived - Authorize - Query received from Cozy: ", query)
+ //log.Debug("WL - EnedisReceived - Authorize - Query received from Cozy: ", query)
+ log.Info("WL - EnedisReceived - Authorize - Query received from Cozy")
clientId := query.Get("client_id")
state := query.Get("state")
@@ -241,7 +242,7 @@ func main() {
}
} else {
logRoute("Cozy_error_enedis_auth")
- log.Debug("WL - CozyError - Enedis - Authorize - Missing parameters in request")
+ log.Info("WL - CozyError - Enedis - Authorize - Missing parameters in request")
http.Error(w, http.StatusText(500), 500)
}
})
@@ -250,7 +251,8 @@ func main() {
mux.HandleFunc("/grdf_authorize", func(w http.ResponseWriter, r *http.Request) {
logRoute("Ping_grdf_new_auth")
query := r.URL.Query()
- log.Debug("WL - GrdfReceived - Authorize - Query received: ", query)
+ //log.Debug("WL - GrdfReceived - Authorize - Query received: ", query)
+ log.Info("WL - GrdfReceived - Authorize - Query received")
clientId := query.Get("client_id")
state := query.Get("state")
@@ -274,7 +276,7 @@ func main() {
}
} else {
logRoute("Cozy_error_grdf_auth")
- log.Debug("WL - CozyError - Grdf - Authorize - Missing parameters in request")
+ log.Info("WL - CozyError - Grdf - Authorize - Missing parameters in request")
http.Error(w, http.StatusText(500), 500)
}
})
@@ -283,7 +285,8 @@ func main() {
mux.HandleFunc("/redirect", func(w http.ResponseWriter, r *http.Request) {
logRoute("Ping_enedis_redirect")
query := r.URL.Query()
- log.Debug("WL - EnedisReceived - Redirect - Query received: ", query)
+ //log.Debug("WL - EnedisReceived - Redirect - Query received: ", query)
+ log.Info("WL - EnedisReceived - Redirect - Query received")
code := query.Get("code")
req_state := query.Get("state")
@@ -336,7 +339,8 @@ func main() {
mux.HandleFunc("/redirect-grdf", func(w http.ResponseWriter, r *http.Request) {
logRoute("Ping_grdf_redirect")
query := r.URL.Query()
- log.Debug("WL - GrdfReceived - Redirect - Received redirect answer from GRDF: ", query)
+ //log.Debug("WL - GrdfReceived - Redirect - Received redirect answer from GRDF: ", query)
+ log.Info("WL - GrdfReceived - Redirect - Received redirect answer from GRDF")
code := query.Get("code")
req_state := query.Get("state")
@@ -368,7 +372,8 @@ func main() {
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
logRoute("Ping_enedis_new_token")
query := r.URL.Query()
- log.Debug("WL - EnedisReceived - Token - Received new token request from Cozy: ", query)
+ // log.Debug("WL - EnedisReceived - Token - Received new token request from Cozy: ", query)
+ log.Info("WL - EnedisReceived - Token - Received new token request from Cozy")
clientId := ""
clientSecret := ""
@@ -378,7 +383,7 @@ func main() {
// For request token params are into query parameters
if len(query) == 0 {
- log.Debug("WL - EnedisInfo - Token - No params found in url query, trying to catch them from body")
+ log.Info("WL - EnedisInfo - Token - No params found in url query, trying to catch them from body")
contents, err := ioutil.ReadAll(r.Body)
if err != nil {
logRoute("Proxy_error_enedis_token")
@@ -437,15 +442,15 @@ func main() {
data.Set("grant_type", grantType)
if refreshToken != "" {
logRoute("Ping_enedis_refresh")
- log.Debug("WL - EnedisReceived - Token - Cozystack asks for a new refresh token")
+ log.Info("WL - EnedisReceived - Token - Cozystack asks for a new refresh token")
data.Set("refresh_token", refreshToken)
data.Set("grant_type", "refresh_token")
} else {
logRoute("Ping_enedis_oauth_token")
- log.Debug("WL - EnedisReceived - Token - Cozystack asks for a regular token to end the oauth dance")
+ log.Info("WL - EnedisReceived - Token - Cozystack asks for a regular token to end the oauth dance")
}
- log.Debug("WL - EnedisInfo - Token - Send request to Enedis token endpoint: ", tokenUrl)
+ log.Info("WL - EnedisInfo - Token - Send request to Enedis token endpoint: ", tokenUrl)
response, err := http.PostForm(tokenUrl, data)
if err != nil {
logRoute("Proxy_error_enedis_token")
@@ -453,7 +458,7 @@ func main() {
http.Error(w, http.StatusText(500), 500)
return
}
- log.Debug("WL - EnedisInfo - Token - Enedis answered back with status ", response.Status)
+ log.Info("WL - EnedisInfo - Token - Enedis answered back with status ", response.Status)
defer response.Body.Close()
if response.StatusCode >= 200 && response.StatusCode <= 299 {
// Set Content-Type in response header
@@ -492,7 +497,8 @@ func main() {
mux.HandleFunc("/grdf_token", func(w http.ResponseWriter, r *http.Request) {
logRoute("Ping_grdf_new_token")
query := r.URL.Query()
- log.Debug("WL - GrdfReceived - Token - Received new token request from Cozy", query)
+ // log.Debug("WL - GrdfReceived - Token - Received new token request from Cozy", query)
+ log.Info("WL - GrdfReceived - Token - Received new token request from Cozy")
clientId := ""
clientSecret := ""
@@ -505,7 +511,7 @@ func main() {
// For request token params are into query parameters
if len(query) == 0 {
- log.Debug("WL - GrdfInfo - Token - No params found in url query \nStack probably asks for a refresh token \nTrying to catch them from body")
+ log.Info("WL - GrdfInfo - Token - No params found in url query \nStack probably asks for a refresh token \nTrying to catch them from body")
contents, err := ioutil.ReadAll(r.Body)
if err != nil {
logRoute("Proxy_error_grdf_token")
@@ -558,8 +564,8 @@ func main() {
data.Set("redirect_uri", redirectUri)
data.Set("code", code)
- log.Debug("WL - GrdfInfo - Token - data sent is: ", data)
- log.Debug("WL - GrdfInfo - Token - Send request to access_token endpoint with authorization_code: ", tokenUrl)
+ // log.Debug("WL - GrdfInfo - Token - data sent is: ", data)
+ log.Info("WL - GrdfInfo - Token - Send request to access_token endpoint with authorization_code: ", tokenUrl)
response, err := http.PostForm(tokenUrl, data)
if err != nil {
logRoute("Proxy_error_grdf_token")
@@ -567,7 +573,7 @@ func main() {
http.Error(w, http.StatusText(500), 500)
return
}
- log.Debug("WL - GrdfInfo - Token - GRDF Endpoint response with status ", response.Status)
+ log.Info("WL - GrdfInfo - Token - GRDF Endpoint response with status ", response.Status)
defer response.Body.Close()
if response.StatusCode >= 200 && response.StatusCode <= 299 {
// Decode response Body using the defined type "GrdfTokenResponse"
@@ -590,7 +596,7 @@ func main() {
if payload[len(payload)-1] != 125 {
payload = append(payload, []byte{125}...)
}
- log.Debug("WL - GrdfInfo - Token - token decoded payload: ", string(payload))
+ // log.Debug("WL - GrdfInfo - Token - token decoded payload: ", string(payload))
// Decode the payload from the token
var token GrdfConsentementToken
err := json.Unmarshal(payload, &token)
@@ -600,7 +606,8 @@ func main() {
http.Error(w, err.Error(), 500)
return
}
- log.Debug("WL - GrdfInfo - Token - Consentements found: ", token.Consentements)
+ // log.Debug("WL - GrdfInfo - Token - Consentements found: ", token.Consentements)
+ log.Info("WL - GrdfInfo - Token - Consentements found")
// Decode the consentement information
if len(token.Consentements) > 0 {
var consentements GrdfConsentement
@@ -639,8 +646,8 @@ func main() {
data2.Set("redirect_uri", redirectUri)
data2.Set("scope", "/adict/v1")
- log.Debug("WL - GrdfInfo - Token - data sent is: ", data2)
- log.Debug("WL - GrdfInfo - Token - send request to access_token endpoint with client_credentials: ", tokenUrl)
+ // log.Debug("WL - GrdfInfo - Token - data sent is: ", data2)
+ log.Info("WL - GrdfInfo - Token - send request to access_token endpoint with client_credentials: ", tokenUrl)
response2, err2 := http.PostForm(tokenUrl, data2)
if err2 != nil {
logRoute("Proxy_error_grdf_token")
@@ -648,7 +655,7 @@ func main() {
http.Error(w, http.StatusText(500), 500)
return
}
- log.Debug("WL - GrdfInfo - Token - Endpoint response with status ", response2.Status)
+ log.Info("WL - GrdfInfo - Token - Endpoint response with status ", response2.Status)
defer response2.Body.Close()
if response2.StatusCode >= 200 && response2.StatusCode <= 299 {
// Set Content-Type in response header
--
GitLab