Browse Source

adds deprecated md5 PW hashing

master
Christian Müller 8 years ago committed by Christian Müller
parent
commit
b0bfa358c4
  1. 11
      storage.go

11
storage.go

@ -2,6 +2,7 @@ package main
import ( import (
"bytes" "bytes"
"crypto/md5"
"crypto/sha256" "crypto/sha256"
"database/sql" "database/sql"
"fmt" "fmt"
@ -24,7 +25,7 @@ const (
) )
type Note struct { type Note struct {
ID, Title, Text, Password string ID, Title, Text, Password, DeprecatedPassword string
Published, Edited time.Time Published, Edited time.Time
Views int Views int
Content, Ads template.HTML Content, Ads template.HTML
@ -32,7 +33,11 @@ type Note struct {
func save(c echo.Context, db *sql.DB, n *Note) (*Note, error) { func save(c echo.Context, db *sql.DB, n *Note) (*Note, error) {
if n.Password != "" { if n.Password != "" {
clean := n.Password
n.Password = fmt.Sprintf("%x", sha256.Sum256([]byte(n.Password))) n.Password = fmt.Sprintf("%x", sha256.Sum256([]byte(n.Password)))
h := md5.New()
h.Write([]byte(clean))
n.DeprecatedPassword = fmt.Sprintf("%x", h.Sum(nil))
} }
if n.ID == "" { if n.ID == "" {
return insert(c, db, n) return insert(c, db, n)
@ -49,9 +54,9 @@ func update(c echo.Context, db *sql.DB, n *Note) (*Note, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
stmt, _ := tx.Prepare("update notes set (text, edited) = (?, ?) where id = ? and password = ?") stmt, _ := tx.Prepare("update notes set (text, edited, password) = (?, ?, ?) where id = ? and (password = ? or password = ?)")
defer stmt.Close() defer stmt.Close()
res, err := stmt.Exec(n.Text, time.Now(), n.ID, n.Password) res, err := stmt.Exec(n.Text, time.Now(), n.Password, n.ID, n.Password, n.DeprecatedPassword)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
return nil, err return nil, err

Loading…
Cancel
Save