Eclipse+Goclipse support. Cleaner folders.

.gitignore

@@ -1,5 +1,8 @@
 .*.swp
 static/doc/*.html
-scramble
 scramble.sql
 build
+bin/
+pkg/
+.settings/
+src/*.*/

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>scramble</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.googlecode.goclipse.goBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>goclipse.goNature</nature>
+	</natures>
+</projectDescription>

Makefile

@@ -1,16 +1,19 @@
+GOPATH := $(shell pwd)
+
 run: build
-	$(GOPATH)/bin/scramble
+	./static/bin/scramble
 
-build: doc $(shell find . -name '*.go')
-	go get .
-	go install .
-	cp $(GOPATH)/bin/scramble static/bin/scramble
+build: doc $(shell find . -name '*.go') $(shell find . -name '*.js')
+	go get scramble
+	mkdir -p bin
+	go build -o bin/scramble src/cmd/scramble/*.go
+	cp bin/scramble static/bin/scramble
 
-test:
-	go test
+test: $(shell find . -name '*.go') $(shell find . -name '*.js')
+	go test scramble
 	cat static/js/stubs.js static/js/sugar.min.js static/js/openpgp.js static/js/scrypt.js static/js/app.js static/js/test.js | node
 
-lint:
+lint: 
 	go get github.com/golang/lint/golint
 	$(GOPATH)/bin/golint *.go
 

src/cmd/scramble/main.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"scramble"
+)
+
+func main() {
+	// HTTP Static Files + REST API
+	scramble.StartHTTPServer()
+
+	// SMTP Incoming Messages
+	scramble.StartSMTPServer()
+	scramble.StartSMTPSaver()
+}

auth.go → src/scramble/auth.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 import (
 	"errors"

config.go → src/scramble/config.go

@@ -1,14 +1,14 @@
-package main
+package scramble
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
-	"errors"
 )
 
 // All configuration for a Scramble server+notary.
@@ -35,16 +35,36 @@ type Config struct {
 }
 
 func validateConfig(cfg *Config) error {
-	if cfg.DbServer == ""     { return errors.New("DbServer must be set") }
-	if cfg.DbUser == ""       { return errors.New("DbUser must be set") }
-	if cfg.DbCatalog == ""    { return errors.New("DbCatalog must be set") }
-	if cfg.SMTPMxHost == ""   { return errors.New("SMTPMxHost must be set") }
-	if cfg.SMTPPort == 0      { return errors.New("SMTPPort must be set") }
-	if cfg.MaxEmailSize == 0   { return errors.New("MaxEmailSize must be set") }
-	if cfg.HTTPPort == 0      { return errors.New("HTTPPort must be set") }
-	if len(cfg.Notaries) == 0 { return errors.New("Notaries must be set") }
-	if len(cfg.ReservedNames) == 0  { return errors.New("ReservedNames must be set") }
-	if cfg.AncestorIDsMaxBytes == 0 { return errors.New("AncestorIDsMaxBytes must be set") }
+	if cfg.DbServer == "" {
+		return errors.New("DbServer must be set")
+	}
+	if cfg.DbUser == "" {
+		return errors.New("DbUser must be set")
+	}
+	if cfg.DbCatalog == "" {
+		return errors.New("DbCatalog must be set")
+	}
+	if cfg.SMTPMxHost == "" {
+		return errors.New("SMTPMxHost must be set")
+	}
+	if cfg.SMTPPort == 0 {
+		return errors.New("SMTPPort must be set")
+	}
+	if cfg.MaxEmailSize == 0 {
+		return errors.New("MaxEmailSize must be set")
+	}
+	if cfg.HTTPPort == 0 {
+		return errors.New("HTTPPort must be set")
+	}
+	if len(cfg.Notaries) == 0 {
+		return errors.New("Notaries must be set")
+	}
+	if len(cfg.ReservedNames) == 0 {
+		return errors.New("ReservedNames must be set")
+	}
+	if cfg.AncestorIDsMaxBytes == 0 {
+		return errors.New("AncestorIDsMaxBytes must be set")
+	}
 	return nil
 }
 

crypto.go → src/scramble/crypto.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 import (
 	"bytes"

crypto_test.go → src/scramble/crypto_test.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 import "testing"
 

email.go → src/scramble/email.go

@@ -1,10 +1,10 @@
-package main
+package scramble
 
 import (
-	"log"
-	"strings"
 	"crypto/rand"
 	"encoding/hex"
+	"log"
+	"strings"
 )
 
 type EmailAddress struct {
@@ -77,7 +77,7 @@ func ParseAngledEmailAddressesSmart(addrList string) EmailAddresses {
 	}
 	addrs := EmailAddresses{}
 	for _, addr := range found {
-		addrs = append(addrs, &EmailAddress{addr[1],addr[2]})
+		addrs = append(addrs, &EmailAddress{addr[1], addr[2]})
 	}
 	return addrs
 }

server.go → src/scramble/handlers.go

@@ -1,15 +1,14 @@
-package main
+package scramble
 
 import (
 	"fmt"
 	"log"
 	"net/http"
 	"runtime/debug"
-	"strings"
 	"time"
 )
 
-func main() {
+func StartHTTPServer() {
 	// Rest API
 	http.HandleFunc("/user/", userHandler)                            // create users, look up hash->pubkey
 	http.HandleFunc("/publickeys/notary", notaryHandler)              // this notary & default client notaries
@@ -27,10 +26,6 @@ func main() {
 	// Resources
 	http.HandleFunc("/", staticHandler) // html, js, css
 
-	// SMTP Incoming Messages
-	StartSMTPServer()
-	StartSMTPSaver()
-
 	// Serve HTTP on localhost only. Let Nginx terminate HTTPS for us.
 	address := fmt.Sprintf("127.0.0.1:%d", GetConfig().HTTPPort)
 	log.Printf("Listening on http://%s\n", address)
@@ -60,7 +55,7 @@ func auth(handler func(http.ResponseWriter, *http.Request, *UserID)) http.Handle
 func recoverAndLogHandler(handler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Wrap the ResponseWriter to remember the status
-		rww := &ResponseWriterWrapper{-1, w}
+		rww := &responseWriterWrapper{200, w}
 		begin := time.Now()
 
 		defer func() {
@@ -75,9 +70,6 @@ func recoverAndLogHandler(handler http.Handler) http.Handler {
 
 			// Finally, log.
 			durationMS := time.Since(begin).Nanoseconds() / 1000000
-			if rww.Status == -1 {
-				rww.Status = 200
-			}
 			log.Printf("%s %s %v %v %s", r.RemoteAddr, r.Method, rww.Status, durationMS, r.URL)
 		}()
 
@@ -86,41 +78,12 @@ func recoverAndLogHandler(handler http.Handler) http.Handler {
 }
 
 // Remember the status for logging
-type ResponseWriterWrapper struct {
+type responseWriterWrapper struct {
 	Status int
 	http.ResponseWriter
 }
 
-func (w *ResponseWriterWrapper) WriteHeader(status int) {
+func (w *responseWriterWrapper) WriteHeader(status int) {
 	w.Status = status
 	w.ResponseWriter.WriteHeader(status)
 }
-
-// Stick it as a deferred statement in gouroutines to prevent the program from crashing.
-// Catches panics and emails a report to the configured AdminEmails
-func Recover() {
-	if e := recover(); e != nil {
-		stack := string(debug.Stack())
-		errorString := fmt.Sprintf("%s:\n%s", e, stack)
-		log.Println("<!> " + errorString)
-		messageID := GenerateMessageID().String()
-		if len(GetConfig().AdminEmails) > 0 {
-			go smtpSendSafe(&OutgoingEmail{
-				Email: Email{
-					EmailHeader: EmailHeader{
-						MessageID: messageID,
-						ThreadID:  messageID,
-						UnixTime:  time.Now().Unix(),
-						From:      "daemon@" + GetConfig().SMTPMxHost,
-						To:        strings.Join(GetConfig().AdminEmails, ","),
-					},
-				},
-				IsPlaintext:      true,
-				PlaintextSubject: "Panic from Scramble server " + GetConfig().SMTPMxHost,
-				PlaintextBody:    errorString,
-			})
-		} else {
-			log.Printf("Set AdminEmails: ['your_email@host',...] in config to receive alerts")
-		}
-	}
-}

handlers.go → src/scramble/handlers_rest.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 import (
 	"encoding/json"
@@ -15,20 +15,6 @@ import (
 	//"github.com/jaekwon/go-prelude/colors"
 )
 
-//
-// SERVE HTML, CSS, JS
-//
-
-func staticHandler(w http.ResponseWriter, r *http.Request) {
-	var path string
-	if strings.HasSuffix(r.URL.Path, "/") {
-		path = r.URL.Path + "index.html"
-	} else {
-		path = r.URL.Path
-	}
-	http.ServeFile(w, r, "static/"+path)
-}
-
 //
 // USER ROUTE
 //

src/scramble/handlers_static.go

@@ -0,0 +1,20 @@
+package scramble
+
+import (
+	"net/http"
+	"strings"
+)
+
+//
+// SERVE HTML, CSS, JS
+//
+
+func staticHandler(w http.ResponseWriter, r *http.Request) {
+	var path string
+	if strings.HasSuffix(r.URL.Path, "/") {
+		path = r.URL.Path + "index.html"
+	} else {
+		path = r.URL.Path
+	}
+	http.ServeFile(w, r, "static/"+path)
+}

handlers_test.go → src/scramble/handlers_test.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 import (
 	"encoding/json"
@@ -78,7 +78,7 @@ func TestPublicKeysHandler(t *testing.T) {
 		"POST", "publickeys/query",
 		url.Values{
 			"needResolution": {tUser.EmailAddress},
-			"needPubKey":     {tUser.EmailAddress+",doesnotexist@"+GetConfig().SMTPMxHost},
+			"needPubKey":     {tUser.EmailAddress + ",doesnotexist@" + GetConfig().SMTPMxHost},
 			"notaries":       {GetConfig().SMTPMxHost},
 		},
 	)

migrations.go → src/scramble/migrations.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 import (
 	"database/sql"

models.go → src/scramble/models.go

@@ -1,4 +1,4 @@
-package main
+package scramble
 
 // User represents a single user, email address, and key pair
 // The email address is <public key hash>@<host>

notary.go → src/scramble/notary.go

@@ -1,6 +1,6 @@
 // See: https://github.com/dcposch/scramble/wiki/Addr-Resolution-via-Notaries
 
-package main
+package scramble
 
 import (
 	"code.google.com/p/go.crypto/openpgp"
@@ -86,6 +86,9 @@ func loadNotaries() {
 	notaryHosts := []string{}
 	for notaryHost, filename := range notaryFiles {
 		pubKeyBytes, err := ioutil.ReadFile(filename)
+		if err != nil {
+			pubKeyBytes, err = ioutil.ReadFile(os.Getenv("GOPATH") + "/" + filename)
+		}
 		if err != nil {
 			panic(err)
 		}

src/scramble/recover.go

@@ -0,0 +1,38 @@
+package scramble
+
+import (
+	"fmt"
+	"log"
+	"runtime/debug"
+	"strings"
+	"time"
+)
+
+// Stick it as a deferred statement in gouroutines to prevent the program from crashing.
+// Catches panics and emails a report to the configured AdminEmails
+func Recover() {
+	if e := recover(); e != nil {
+		stack := string(debug.Stack())
+		errorString := fmt.Sprintf("%s:\n%s", e, stack)
+		log.Println("<!> " + errorString)
+		messageID := GenerateMessageID().String()
+		if len(GetConfig().AdminEmails) > 0 {
+			go smtpSendSafe(&OutgoingEmail{
+				Email: Email{
+					EmailHeader: EmailHeader{
+						MessageID: messageID,
+						ThreadID:  messageID,
+						UnixTime:  time.Now().Unix(),
+						From:      "daemon@" + GetConfig().SMTPMxHost,
+						To:        strings.Join(GetConfig().AdminEmails, ","),
+					},
+				},
+				IsPlaintext:      true,
+				PlaintextSubject: "Panic from Scramble server " + GetConfig().SMTPMxHost,
+				PlaintextBody:    errorString,
+			})
+		} else {
+			log.Printf("Set AdminEmails: ['your_email@host',...] in config to receive alerts")
+		}
+	}
+}