apps/fastpastebin
2
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases 4 Wiki Activity

Logger refactoring, part 1.

Browse Source
This commit is contained in:
Stanislav Nikitin 2019-04-13 00:05:22 +05:00
parent 7281b9be65
commit 4f01e2f5ce
No known key found for this signature in database
GPG Key ID: 106900B32F8192EE
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
domains/pastes/paste_get.go
View File

@ -43,13 +43,13 @@ func pasteGetData(pasteID int, timestamp int64, cookieValue string) (*structs.Pa
// Get paste. // Get paste.
paste, err1 := c.Database.GetPaste(pasteID) paste, err1 := c.Database.GetPaste(pasteID)
if err1 != nil { if err1 != nil {
c.Logger.Error().Msgf("Failed to get paste #%d: %s", pasteID, err1.Error()) c.Logger.Error().Err(err1).Int("paste ID", pasteID).Msg("Failed to get paste")
return nil, pasteNotFound return nil, pasteNotFound
} }
// Check if paste is expired. // Check if paste is expired.
if paste.IsExpired() { if paste.IsExpired() {
c.Logger.Error().Msgf("Paste #%d is expired", pasteID) c.Logger.Error().Int("paste ID", pasteID).Msg("Paste is expired")
return nil, pasteExpired return nil, pasteExpired
} }
@ -57,7 +57,7 @@ func pasteGetData(pasteID int, timestamp int64, cookieValue string) (*structs.Pa
if paste.Private { if paste.Private {
pasteTs := paste.CreatedAt.Unix() pasteTs := paste.CreatedAt.Unix()
if timestamp != pasteTs { if timestamp != pasteTs {
c.Logger.Error().Msgf("Incorrect timestamp '%d' provided for private paste #%d, waiting for %d", timestamp, pasteID, pasteTs) c.Logger.Error().Int("paste ID", pasteID).Int64("paste timestamp", pasteTs).Int64("provided timestamp", timestamp).Msg("Incorrect timestamp provided for private paste")
return nil, pasteTimestampInvalid return nil, pasteTimestampInvalid
} }
} }
@ -90,7 +90,7 @@ func pasteGETWebInterface(ec echo.Context) error {
// error. // error.
pasteID, _ := strconv.Atoi(regexInts.FindAllString(pasteIDRaw, 1)[0]) pasteID, _ := strconv.Atoi(regexInts.FindAllString(pasteIDRaw, 1)[0])
pasteIDStr := strconv.Itoa(pasteID) pasteIDStr := strconv.Itoa(pasteID)
c.Logger.Debug().Msgf("Trying to get paste #%+v", pasteID) c.Logger.Debug().Int("paste ID", pasteID).Msg("Trying to get paste data")
// Check if we have timestamp passed. // Check if we have timestamp passed.
// If passed timestamp is invalid (isn't a real UNIX timestamp) we // If passed timestamp is invalid (isn't a real UNIX timestamp) we
@ -100,7 +100,7 @@ func pasteGETWebInterface(ec echo.Context) error {
if tsProvidedStr != "" { if tsProvidedStr != "" {
tsProvided, err := strconv.ParseInt(tsProvidedStr, 10, 64) tsProvided, err := strconv.ParseInt(tsProvidedStr, 10, 64)
if err != nil { if err != nil {
c.Logger.Error().Err(err).Msgf("Invalid timestamp '%s' provided for getting private paste #%d", tsProvidedStr, pasteID) c.Logger.Error().Err(err).Int("paste ID", pasteID).Int64("provided timestamp", tsProvided).Msg("Invalid timestamp provided for getting private paste")
errtpl := templater.GetErrorTemplate(ec, "Paste #"+pasteIDStr+" not found") errtpl := templater.GetErrorTemplate(ec, "Paste #"+pasteIDStr+" not found")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} else { } else {
@ -127,7 +127,7 @@ func pasteGETWebInterface(ec echo.Context) error {
// If passed cookie value was invalid - go to paste authorization // If passed cookie value was invalid - go to paste authorization
// page. // page.
if error == pasteCookieInvalid { if error == pasteCookieInvalid {
c.Logger.Info().Msg("Invalid cookie, redirecting to auth page...") c.Logger.Info().Int("paste ID", pasteID).Msg("Invalid cookie, redirecting to auth page")
return ec.Redirect(http.StatusMovedPermanently, "/paste/"+pasteIDStr+"/"+ec.Param("timestamp")+"/verify") return ec.Redirect(http.StatusMovedPermanently, "/paste/"+pasteIDStr+"/"+ec.Param("timestamp")+"/verify")
} }
@ -161,7 +161,7 @@ func pasteGETWebInterface(ec echo.Context) error {
// Tokenize paste data. // Tokenize paste data.
lexered, err3 := lexer.Tokenise(nil, paste.Data) lexered, err3 := lexer.Tokenise(nil, paste.Data)
if err3 != nil { if err3 != nil {
c.Logger.Error().Msgf("Failed to tokenize paste data: %s", err3.Error()) c.Logger.Error().Err(err3).Msg("Failed to tokenize paste data")
} }
// Get style for HTML output. // Get style for HTML output.
style := styles.Get("monokai") style := styles.Get("monokai")
@ -177,7 +177,7 @@ func pasteGETWebInterface(ec echo.Context) error {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
err4 := formatter.Format(buf, style, lexered) err4 := formatter.Format(buf, style, lexered)
if err4 != nil { if err4 != nil {
c.Logger.Error().Msgf("Failed to format paste data: %s", err4.Error()) c.Logger.Error().Err(err4).Msg("Failed to format paste data")
} }
pasteData["pastedata"] = buf.String() pasteData["pastedata"] = buf.String()
@ -198,7 +198,7 @@ func pastePasswordedVerifyGet(ec echo.Context) error {
// Get paste. // Get paste.
paste, err1 := c.Database.GetPaste(pasteID) paste, err1 := c.Database.GetPaste(pasteID)
if err1 != nil { if err1 != nil {
c.Logger.Error().Msgf("Failed to get paste #%d: %s", pasteID, err1.Error()) c.Logger.Error().Err(err1).Int("paste ID", pasteID).Msg("Failed to get paste data")
errtpl := templater.GetErrorTemplate(ec, "Paste #"+pasteIDRaw+" not found") errtpl := templater.GetErrorTemplate(ec, "Paste #"+pasteIDRaw+" not found")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} }
@ -243,12 +243,12 @@ func pastePasswordedVerifyPost(ec echo.Context) error {
// We already get numbers from string, so we will not check strconv.Atoi() // We already get numbers from string, so we will not check strconv.Atoi()
// error. // error.
pasteID, _ := strconv.Atoi(regexInts.FindAllString(pasteIDRaw, 1)[0]) pasteID, _ := strconv.Atoi(regexInts.FindAllString(pasteIDRaw, 1)[0])
c.Logger.Debug().Msgf("Requesting paste #%+v", pasteID) c.Logger.Debug().Int("paste ID", pasteID).Msg("Requesting paste")
// Get paste. // Get paste.
paste, err1 := c.Database.GetPaste(pasteID) paste, err1 := c.Database.GetPaste(pasteID)
if err1 != nil { if err1 != nil {
c.Logger.Error().Msgf("Failed to get paste #%d: %s", pasteID, err1.Error()) c.Logger.Error().Err(err1).Int("paste ID", pasteID).Msg("Failed to get paste")
errtpl := templater.GetErrorTemplate(ec, "Paste #"+strconv.Itoa(pasteID)+" not found") errtpl := templater.GetErrorTemplate(ec, "Paste #"+strconv.Itoa(pasteID)+" not found")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} }
@ -289,17 +289,17 @@ func pasteRawGETWebInterface(ec echo.Context) error {
// We already get numbers from string, so we will not check strconv.Atoi() // We already get numbers from string, so we will not check strconv.Atoi()
// error. // error.
pasteID, _ := strconv.Atoi(regexInts.FindAllString(pasteIDRaw, 1)[0]) pasteID, _ := strconv.Atoi(regexInts.FindAllString(pasteIDRaw, 1)[0])
c.Logger.Debug().Msgf("Requesting paste #%+v", pasteID) c.Logger.Debug().Int("paste ID", pasteID).Msg("Requesting paste data")
// Get paste. // Get paste.
paste, err1 := c.Database.GetPaste(pasteID) paste, err1 := c.Database.GetPaste(pasteID)
if err1 != nil { if err1 != nil {
c.Logger.Error().Msgf("Failed to get paste #%d from database: %s", pasteID, err1.Error()) c.Logger.Error().Err(err1).Int("paste ID", pasteID).Msg("Failed to get paste from database")
return ec.HTML(http.StatusBadRequest, "Paste #"+pasteIDRaw+" does not exist.") return ec.HTML(http.StatusBadRequest, "Paste #"+pasteIDRaw+" does not exist.")
} }
if paste.IsExpired() { if paste.IsExpired() {
c.Logger.Error().Msgf("Paste #%d is expired", pasteID) c.Logger.Error().Int("paste ID", pasteID).Msg("Paste is expired")
return ec.HTML(http.StatusBadRequest, "Paste #"+pasteIDRaw+" does not exist.") return ec.HTML(http.StatusBadRequest, "Paste #"+pasteIDRaw+" does not exist.")
} }
@ -308,12 +308,12 @@ func pasteRawGETWebInterface(ec echo.Context) error {
tsProvidedStr := ec.Param("timestamp") tsProvidedStr := ec.Param("timestamp")
tsProvided, err2 := strconv.ParseInt(tsProvidedStr, 10, 64) tsProvided, err2 := strconv.ParseInt(tsProvidedStr, 10, 64)
if err2 != nil { if err2 != nil {
c.Logger.Error().Msgf("Invalid timestamp '%s' provided for getting private paste #%d: %s", tsProvidedStr, pasteID, err2.Error()) c.Logger.Error().Err(err2).Int("paste ID", pasteID).Str("provided timestamp", tsProvidedStr).Msg("Invalid timestamp provided for getting private paste")
return ec.String(http.StatusBadRequest, "Paste #"+pasteIDRaw+" not found") return ec.String(http.StatusBadRequest, "Paste #"+pasteIDRaw+" not found")
} }
pasteTs := paste.CreatedAt.Unix() pasteTs := paste.CreatedAt.Unix()
if tsProvided != pasteTs { if tsProvided != pasteTs {
c.Logger.Error().Msgf("Incorrect timestamp '%v' provided for private paste #%d, waiting for %v", tsProvidedStr, pasteID, strconv.FormatInt(pasteTs, 10)) c.Logger.Error().Int("paste ID", pasteID).Int64("provided timestamp", tsProvided).Int64("paste timestamp", pasteTs).Msg("Incorrect timestamp provided for private paste")
return ec.String(http.StatusBadRequest, "Paste #"+pasteIDRaw+" not found") return ec.String(http.StatusBadRequest, "Paste #"+pasteIDRaw+" not found")
} }
} }
@ -321,7 +321,7 @@ func pasteRawGETWebInterface(ec echo.Context) error {
// ToDo: figure out how to handle passworded pastes here. // ToDo: figure out how to handle passworded pastes here.
// Return error for now. // Return error for now.
if paste.Password != "" { if paste.Password != "" {
c.Logger.Error().Msgf("Cannot render paste #%d as raw: passworded paste. Patches welcome!", pasteID) c.Logger.Error().Int("paste ID", pasteID).Msg("Cannot render paste as raw: passworded paste. Patches welcome!")
return ec.String(http.StatusBadRequest, "Paste #"+pasteIDRaw+" not found") return ec.String(http.StatusBadRequest, "Paste #"+pasteIDRaw+" not found")
} }

7
domains/pastes/paste_post.go
View File

@ -30,6 +30,7 @@ func pastePOSTWebInterface(ec echo.Context) error {
params, err := ec.FormParams() params, err := ec.FormParams()
if err != nil { if err != nil {
c.Logger.Error().Msg("Passed paste form is empty")
errtpl := templater.GetErrorTemplate(ec, "Cannot create empty paste") errtpl := templater.GetErrorTemplate(ec, "Cannot create empty paste")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} }
@ -43,14 +44,14 @@ func pastePOSTWebInterface(ec echo.Context) error {
} }
if !strings.ContainsAny(params["paste-keep-for"][0], "Mmhd") && params["paste-keep-for"][0] != "forever" { if !strings.ContainsAny(params["paste-keep-for"][0], "Mmhd") && params["paste-keep-for"][0] != "forever" {
c.Logger.Debug().Msgf("'Keep paste for' field have invalid value: %s", params["paste-keep-for"][0]) c.Logger.Debug().Str("field value", params["paste-keep-for"][0]).Msg("'Keep paste for' field have invalid value")
errtpl := templater.GetErrorTemplate(ec, "Invalid 'Paste should be available for' parameter passed. Please do not try to hack us ;).") errtpl := templater.GetErrorTemplate(ec, "Invalid 'Paste should be available for' parameter passed. Please do not try to hack us ;).")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} }
// Verify captcha. // Verify captcha.
if !captcha.Verify(params["paste-captcha-id"][0], params["paste-captcha-solution"][0]) { if !captcha.Verify(params["paste-captcha-id"][0], params["paste-captcha-solution"][0]) {
c.Logger.Debug().Msgf("Invalid captcha solution for captcha ID '%s': %s", params["paste-captcha-id"][0], params["paste-captcha-solution"][0]) c.Logger.Debug().Str("captcha ID", params["paste-captcha-id"][0]).Str("captcha solution", params["paste-captcha-solution"][0]).Msg("Invalid captcha solution")
errtpl := templater.GetErrorTemplate(ec, "Invalid captcha solution.") errtpl := templater.GetErrorTemplate(ec, "Invalid captcha solution.")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} }
@ -116,7 +117,7 @@ func pastePOSTWebInterface(ec echo.Context) error {
id, err2 := c.Database.SavePaste(paste) id, err2 := c.Database.SavePaste(paste)
if err2 != nil { if err2 != nil {
c.Logger.Error().Msgf("Failed to save paste: %s", err2.Error()) c.Logger.Error().Err(err2).Msg("Failed to save paste")
errtpl := templater.GetErrorTemplate(ec, "Failed to save paste. Please, try again later.") errtpl := templater.GetErrorTemplate(ec, "Failed to save paste. Please, try again later.")
return ec.HTML(http.StatusBadRequest, errtpl) return ec.HTML(http.StatusBadRequest, errtpl)
} }

4
domains/pastes/pastes_get.go
View File

@ -54,7 +54,7 @@ func pastesGET(ec echo.Context) error {
page, _ = strconv.Atoi(pageRaw) page, _ = strconv.Atoi(pageRaw)
} }
c.Logger.Debug().Msgf("Requested page #%d", page) c.Logger.Debug().Int("page", page).Msg("Requested page")
// Get pastes IDs. // Get pastes IDs.
pastes, err3 := c.Database.GetPagedPastes(page) pastes, err3 := c.Database.GetPagedPastes(page)
@ -64,7 +64,7 @@ func pastesGET(ec echo.Context) error {
// Show "No pastes to show" on any error for now. // Show "No pastes to show" on any error for now.
if err3 != nil { if err3 != nil {
c.Logger.Error().Msgf("Failed to get pastes list from database: %s", err3.Error()) c.Logger.Error().Err(err3).Msg("Failed to get pastes list from database")
noPastesToShowTpl := templater.GetErrorTemplate(ec, "No pastes to show.") noPastesToShowTpl := templater.GetErrorTemplate(ec, "No pastes to show.")
return ec.HTML(http.StatusOK, noPastesToShowTpl) return ec.HTML(http.StatusOK, noPastesToShowTpl)
} }