From 9645214e40af9b492b11d616955054d2436ee529 Mon Sep 17 00:00:00 2001
From: Johan Haals <jhaals@spotify.com>
Date: Thu, 4 May 2017 11:07:27 +0200
Subject: [PATCH] Fix gorilla mux startup panic. Bump dependencies

- fix startup panic due to change in regexp matching in gorilla/mux
- bump sjcl and clipboard.js
- bump to go.uuid
---
 public/index.html | 4 ++--
 yopass.go         | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/index.html b/public/index.html
index d0acc88bd..f2424223b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,8 +15,8 @@
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-route.min.js" integrity="sha256-cSGSOcFF66XhVJmkBJLDSHDSYEd32PmWU4Wpc+0oRXk= sha384-vKUG6ZisndNtIFOTSdC1VoTcFLTD9Iv5KMkeIAYhTVQvXaDs6zCW1M3ceLyVccge sha512-nQ5xr3a2uSzXywQV3u71CO+D02Lw126IFf8aj5epptUpmtRwDzI4ri+DbZBYQOpGWnmWIYHHQ1Ybyo4qg0i/7A==" crossorigin="anonymous"></script>
 
     <script type="text/javascript" src="js/app.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.12/clipboard.min.js" integrity="sha256-YPxFEfHAzLj9n2T+2UXAKGNCRUINk0BexppujiVhRH0= sha384-zD0rXhmVlFWUQYNE6qhnghclEAj+YgdpXMO/izgNBWhg9CZTYfQx/LlgPCUfSH7V sha512-KFWecP2K4Gw2jaWso5S9+6pOt0/Kb9O5QI/itUPLoXajRaRqLXVMPfyBWtf75VB0DO7hBhbyMINtXdLfiYrqWQ==" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/sjcl/1.0.0/sjcl.min.js" integrity="sha256-UC26B+OwjcmDTkG0Sn5QqmxxJMGtiTMa3hsqp4m0JdI= sha384-4ZQxwTQVe6JKB1ZW/OMGW4b82BLHuCAhJoMCHS9TKe3pflXqmyezPpR5AnxqBqs0 sha512-w+6QCvB8/xlf0o6j69H2R2am+X7PR4isJxWRXDDrRXOPLaf4r0wqHZL9rR72SWM6jPUCUD8jteKqbOULtemUcw==" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.6.1/clipboard.min.js" integrity="sha384-5Xf4OcJaQulbWLJD5/jIRdA35xOLc089T+KA+CcwO/azAqGzJQLaOeHiAAbl8XSf" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/sjcl/1.0.6/sjcl.min.js" integrity="sha384-uUk05Hm5S/G7X2TUGZj9GIX4zH0Z/Enc47TkjSCCJCoR0jOdAVlEWvstJgRdF/AG" crossorigin="anonymous"></script>
 
     <!-- Custom CSS -->
     <style>
diff --git a/yopass.go b/yopass.go
index 8676b385b..89f9207a9 100644
--- a/yopass.go
+++ b/yopass.go
@@ -10,7 +10,7 @@ import (
 	"github.com/bradfitz/gomemcache/memcache"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"github.com/pborman/uuid"
+	"github.com/satori/go.uuid"
 )
 
 // Database interface
@@ -91,7 +91,7 @@ func saveHandler(response http.ResponseWriter, request *http.Request,
 	}
 
 	// Generate new UUID and store secret in memcache with specified expiration
-	uuid := uuid.NewUUID()
+	uuid := uuid.NewV4()
 	err = db.Set(uuid.String(), secret.Message, secret.Expiration)
 	if err != nil {
 		http.Error(response, `{"message": "Failed to store secret in database"}`, http.StatusInternalServerError)
@@ -106,7 +106,6 @@ func saveHandler(response http.ResponseWriter, request *http.Request,
 // Handle GET requests
 func getHandler(response http.ResponseWriter, request *http.Request, db Database) {
 	response.Header().Set("Content-type", "application/json")
-
 	secret, err := db.Get(mux.Vars(request)["uuid"])
 	if err != nil {
 		if err.Error() == "memcache: cache miss" {
@@ -147,12 +146,12 @@ func main() {
 
 	mx := mux.NewRouter()
 	// GET secret
-	mx.HandleFunc("/secret/{uuid:([0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12})}",
+	mx.HandleFunc("/secret/{uuid:(?:[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12})}",
 		func(response http.ResponseWriter, request *http.Request) {
 			getHandler(response, request, mc)
 		}).Methods("GET")
 	// Check secret status
-	mx.HandleFunc("/secret/{uuid:([0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12})}",
+	mx.HandleFunc("/secret/{uuid:(?:[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12})}",
 		func(response http.ResponseWriter, request *http.Request) {
 			messageStatus(response, request, mc)
 		}).Methods("HEAD")