Merge pull request #2 from DesmondANIMUS/Dev

reverted

kazi.go

@@ -16,7 +16,6 @@ import (
 	"fmt"
 	"io"
 
-	"encoding/base32"
 	"encoding/hex"
 
 	"golang.org/x/crypto/nacl/secretbox"
@@ -38,24 +37,13 @@ func init() {
 	r := mux.NewRouter()
 
 	r.HandleFunc("/", index)
-	r.HandleFunc("/submitMessage", submitMessage)
 	r.HandleFunc("/msg/", message)
 
-	csrf.Protect([]byte(randgen(20)))(r)
+	csrf.Protect([]byte("32-byte-long-auth-key"))(r)
 }
 
 // create a message
 func index(w http.ResponseWriter, r *http.Request) {
-	err := tpl.ExecuteTemplate(w, "index.html", map[string]interface{}{
-		csrf.TemplateTag: csrf.TemplateField(r),
-	})
-
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-}
-func submitMessage(w http.ResponseWriter, r *http.Request) {
 	ctx := appengine.NewContext(r)
 	var keySystem msgAndSecretKeys
 
@@ -83,6 +71,14 @@ func submitMessage(w http.ResponseWriter, r *http.Request) {
 
 		err = tpl.ExecuteTemplate(w, "secret.html", keySystem)
 
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+	} else {
+		err := tpl.ExecuteTemplate(w, "index.html", nil)
+
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -175,11 +171,3 @@ func generatePassword() [32]byte {
 
 	return password
 }
-func randgen(length int) string {
-	randomBytes := make([]byte, 32)
-	_, err := rand.Read(randomBytes)
-	if err != nil {
-		panic(err)
-	}
-	return base32.StdEncoding.EncodeToString(randomBytes)[:length]
-}