Fixes

Author: osminogin

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 .idea/
 
 npm-debug.log

.vscode/launch.json

@@ -53,18 +53,14 @@ var (
 func main() {
 	// Configuration settings.
 	v := viper.New()
-
 	v.SetDefault("PORT", 8000)
-	v.SetDefault("DATABASE_URL", "psql://postgres:postgres@localhost/postgres")
+	v.SetDefault("DATABASE_URL", "postgres://postgres:postgres@localhost/postgres")
 	v.SetDefault("VERSION", GitCommit)
 
-	v.SetConfigName("")
-	v.SetConfigType("env")
-	_ = v.ReadInConfig()
-
 	v.SetConfigName(".env")
 	v.SetConfigType("dotenv")
 	v.AddConfigPath(".")
+	v.ReadInConfig()
 	v.AutomaticEnv()
 
 	// Server init and run.

cmd/tornote/main.go

@@ -3,11 +3,9 @@ module github.com/osminogin/tornote
 go 1.14
 
 require (
-	github.com/go-pg/pg v8.0.7+incompatible // indirect
 	github.com/go-pg/pg/v10 v10.0.0-beta.2
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.4
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible
 	github.com/segmentio/encoding v0.1.14 // indirect
 	github.com/spf13/viper v1.7.0
 	golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect

db.schema

@@ -17,15 +17,12 @@
 package tornote
 
 import (
-	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"github.com/google/uuid"
-	"log"
 	"net/http"
 
+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"github.com/go-pg/pg/v10"
 )
 
 // frontPageHandler render home page.
@@ -36,79 +33,54 @@ func frontPageHandler(w http.ResponseWriter, r *http.Request) {
 // publicFileHandler get file from bindata or return not found error.
 func publicFileHandler(w http.ResponseWriter, r *http.Request) {
 	uri := r.URL.Path[1:]
-	log.Print(uri)
 	http.ServeFile(w, r, uri)
-
-	//data, err := Asset()
-	//if err != nil {
-	//	http.Error(w, err.Error(), http.StatusNotFound)
-	//	return
-	//}
-
-	// Set headers by file extension
-	//switch filepath.Ext(r.URL.Path[1:]) {
-	//case ".js":
-	//	w.Header().Set("Content-Type", "application/javascript; charset=utf-8")
-	//case ".css":
-	//	w.Header().Set("Content-Type", "text/css")
-	//}
-	//
-	//w.Write(data)
 }
 
 // readNoteHandler print encrypted data for client-side decrypt and destroy note.
-func readNoteHandler(db *pg.DB) http.Handler {
+func readNoteHandler(s *server) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		vars := mux.Vars(r)
-
-		// Valid UUID required.
-		id, err := uuid.Parse(vars["id"])
+		raw, _ := base64.RawURLEncoding.DecodeString(vars["id"])
+		id, err := uuid.FromBytes(raw)
 		if err != nil {
-			http.Error(w, "", http.StatusBadRequest)
+			http.NotFound(w, r)
 			return
 		}
 
-		note := &Note{ID: id}
+		n := &Note{UUID: id}
 
-		// Get encrypted note or return 404
-		err = db.Select(note)
+		// Get encrypted n or return 404
+		err = s.db.Select(n)
 		if err != nil {
 			http.NotFound(w, r)
 			return
 		}
-		// Deferred note deletion
+		// Deferred n deletion
 		defer func() {
-			db.Delete(note)
+			s.db.Delete(n)
 		}()
 
-		// Print encrypted note to user
-		renderTemplate(w, "note.html", note.Data)
+		// Print encrypted n to user
+		renderTemplate(w, "note.html", string(n.Data))
 	})
 }
 
-// saveNoteHandler save secret note to persistent datastore and return note ID.
-func saveNoteHandler(db *pg.DB) http.Handler {
+// createNoteHandler save secret note to persistent datastore and return note ID.
+func createNoteHandler(s *server) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		encrypted := r.FormValue("body")
-		secret := make([]byte, 11)
-
-		// Generate random data for note id
-		_, err := rand.Read(secret)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
+		n := &Note{
+			UUID: uuid.New(),
+			Data: []byte(r.FormValue("body")),
 		}
 
-		// Encode note id with URL safe format
-		id := base64.RawURLEncoding.EncodeToString(secret)
-
-		// Save data to database
-		_, err = db.Exec("INSERT INTO notes (id, encrypted) VALUES (?, ?)", id, encrypted)
+		err := s.db.Insert(n)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
 
-		fmt.Fprint(w, id)
+		b, _ := n.UUID.MarshalBinary()
+		marshalled := base64.RawURLEncoding.EncodeToString(b)
+		fmt.Fprint(w, marshalled)
 	})
 }

go.mod

@@ -2,13 +2,12 @@ package tornote
 
 import (
 	"fmt"
-
 	"github.com/google/uuid"
 )
 
 type Note struct {
-	ID	uuid.UUID	`json:"-" sql:",type:uuid"`
-	Data []byte		`json:"data"`
+	UUID uuid.UUID `json:"-" pg:",pk,type:uuid"`
+	Data []byte    `json:"data"`
 }
 
 type Encrypter interface {
@@ -20,5 +19,5 @@ type Decrypter interface {
 }
 
 func (u *Note) String() string {
-	return fmt.Sprintf("%v", u.ID)
+	return fmt.Sprintf("%v %d bytes", u.UUID, len(u.Data))
 }

go.sum

@@ -6,7 +6,7 @@ $(document).ready(function() {
     $("#note").submit(function(event) {
         var form = $(this);
         var text = form.find("textarea").val();
-        var secret = sjcl.codec.base64url.fromBits(sjcl.random.randomWords(3));
+        var secret = sjcl.codec.base64url.fromBits(sjcl.random.randomWords(5));
         var encrypted = sjcl.encrypt(secret, text);
 
         $.ajax({

handlers.go

@@ -20,18 +20,12 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"html/template"
-	"strings"
 
-	"github.com/gorilla/mux"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
-	_ "github.com/mattn/go-sqlite3"
+	"github.com/gorilla/mux"
 )
 
-// XXX: Move inside server struct.
-var Templates map[string]*template.Template
-
 type server struct {
 	// Listen port
 	Port uint64
@@ -64,10 +58,10 @@ func (s *server) connectDB() error {
 	}
 	s.db = pg.Connect(opt)
 
-	// Ping postgres connection
-	if err = s.db.Ping(nil); err != nil {
-		return err
-	}
+	// XXX: Ping postgres connection
+	//if err = s.db.Ping(); err != nil {
+	//	return err
+	//}
 	return nil
 }
 
@@ -82,36 +76,16 @@ func (s *server) createSchema() error {
 	return nil
 }
 
-// Compiles templates from templates/ dir into global map.
-func compileTemplates() (err error) {
-	if Templates == nil {
-		Templates = make(map[string]*template.Template)
-	}
-	// XXX:
-	layout := "templates/base.html"
-	pages := []string{
-		"templates/index.html",
-		"templates/note.html",
-	}
-	for _, file := range pages {
-		baseName := strings.TrimLeft(file, "templates/")
-		Templates[baseName], err = template.New("").ParseFiles(file, layout)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // Running daemon process.
 func (s *server) Run() error {
 	r := mux.NewRouter().StrictSlash(true)
 
 	// HTTP handlers
 	r.HandleFunc("/", frontPageHandler).Methods("GET")
+	//r.PathPrefix("/favicon.ico").HandlerFunc(publicFileHandler).Methods("GET")
 	r.PathPrefix("/public/").HandlerFunc(publicFileHandler).Methods("GET")
-	r.Handle("/note", saveNoteHandler(s.db)).Methods("POST")
-	r.Handle("/{id}", readNoteHandler(s.db)).Methods("GET")
+	r.Handle("/note", createNoteHandler(s)).Methods("POST")
+	r.Handle("/{id}", readNoteHandler(s)).Methods("GET")
 
 	// Connecting to database
 	if err := s.connectDB(); err != nil {

note.go

@@ -18,9 +18,34 @@ package tornote
 
 import (
 	"errors"
+	"html/template"
 	"net/http"
+	"strings"
 )
 
+var Templates map[string]*template.Template
+
+
+// Compiles templates from templates/ dir into global map.
+func compileTemplates() (err error) {
+	if Templates == nil {
+		Templates = make(map[string]*template.Template)
+	}
+	// XXX:
+	layout := "templates/base.html"
+	pages := []string{
+		"templates/index.html",
+		"templates/note.html",
+	}
+	for _, file := range pages {
+		baseName := strings.TrimLeft(file, "templates/")
+		Templates[baseName], err = template.New("").ParseFiles(file, layout)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
 
 // Wrapper around template.ExecuteTemplate method.
 func renderTemplate(w http.ResponseWriter, name string, data interface{}) error {

public/main.js

@@ -43,8 +43,8 @@
     </footer>
 
     <!-- User scripts -->
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
-            integrity="sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js"
+            integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
             crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/sjcl/1.0.8/sjcl.min.js"
             integrity="sha256-nIoG9XIePM1QNttI6KAGLYGNxc4DNinxxmOZW0/Z7uA="

server.go

@@ -26,7 +26,7 @@
         </div>
         <div class="form-group text-center">
             <button type="submit" class="btn btn-lg btn-success">
-                <span class="glyphicon glyphicon-record small"></span>
+                <span class="glyphicon glyphicon-ok small"></span>
                 Create note
             </button>
         </div>
@@ -44,9 +44,9 @@
             <span class="glyphicon glyphicon-fire small"></span>
             Read and destroy
         </a>
-        <a href="/" class="btn btn-lg btn-success">
-            <span class="glyphicon glyphicon-record small"></span>
-            Create another note
+        <a href="/" class="btn btn-lg btn-default">
+            <span class="glyphicon glyphicon-share-alt small"></span>
+            Another note
         </a>
     </div>
 </div>

utils.go templates.go

@@ -4,14 +4,14 @@
 <div class="form-group">
     <label for="secret_note">
         This note permanently deleted after reading
-        <span class="glyphicon glyphicon-fire"></span>:
+        <span class="glyphicon glyphicon-fire text-danger"></span>:
     </label>
     <pre id="secret_note" class="hidden">{{.}}</pre>
 </div>
 <div class="form-group text-center">
-    <a href="/" class="btn btn-lg btn-success">
-        <span class="glyphicon glyphicon-record small"></span>
-        Create another note
+    <a href="/" class="btn btn-lg btn-default">
+        <span class="glyphicon glyphicon-share-alt small"></span>
+        Another note
     </a>
 </div>
 {{ end }}