some spelling fixes, rolling index scenarios, and fine tuning

main.go

@@ -3,6 +3,7 @@ package main
import (
	"log"
	"net/http"
	"os"
)
func main() {
@@ -14,5 +15,15 @@ func main() {
	http.HandleFunc("/book", BookHandler)
	http.HandleFunc("/", DefaultHandler)
	log.Fatal(http.ListenAndServe("localhost:8080", nil))
	log.Fatal(http.ListenAndServe(address(), nil))
}
// Retrieve the web server address from the environment variable ENIGMA_SERVER if possible.
// If the environment variable is not set then default to "localhost:8080".
func address() string {
	env := os.Getenv("ENIGMA_SERVER")
	if env == "" {
		return "localhost:8080"
	}
	return env
}

main_test.go

@@ -19,9 +19,9 @@ func TestGeneratePassphrase(t *testing.T) {
	}
	i := 0
	expected := "C\\041|e1dc001da138"
	expected := "Ce\\41ae|dc001da138"
	for i = 0; i < 2; i++ {
		b, _ := generatePassphrase(profile, passphrase, site)
		b := site.generatePassphrase(profile, passphrase)
		actual := fmt.Sprintf("%s", string(b))
		if actual != expected {
			t.FailNow()
@@ -88,6 +88,13 @@ func TestContainsSpecialCharacters(t *testing.T) {
	if actual != expected {
		t.FailNow()
	}
	special = " "
	expected = true
	actual = containsSpecialCharacters([]byte("Blah BLa l "), special, 2)
	if actual != expected {
		t.FailNow()
	}
}
func TestLength(t *testing.T) {

resources.go

@@ -106,6 +106,9 @@ const (
        .tab-content > .tab-pane {
            padding: 1em;
        }
		span.password {
			margin-left: 1em;
		}
    </style>
    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -154,7 +157,7 @@ const (
                                        <input name="host" type="hidden" value="{{ .Host }}" />
										<button class="btn btn-default btn-xs" title="Generate a new password"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></button>
                                    </form>
                                    <span>{{ .Password }}</span>
                                    <span class="password">{{ .Password }}</span>
                                </td>
                                <td class="text-right">
                                    <form class="form form-horizontal" action="/api/remove" method="post">
@@ -311,7 +314,7 @@ const (
                                    <button name="cmd" value="update" type="submit" class="btn btn-default" title="Update profile passphrase">Update Passphrase</button>
                                </div>
                                <div class="col-xs-3 text-right">
									<button name="cmd" value="delete" type="submit" class="btn btn-danger" title="Permanenantly delete this account">Delete Profile</button>
									<button name="cmd" value="delete" type="submit" class="btn btn-danger" title="Permanently delete this account">Delete Profile</button>
                                </div>
                            </div>
                        </form>

site.go

@@ -4,6 +4,7 @@ import (
	"crypto/sha512"
	"fmt"
	"log"
	"math"
	"regexp"
	"strings"
)
@@ -37,6 +38,7 @@ func (s *Site) generatePassphrase(profile, passphrase string) []byte {
func (s *Site) applyCriteria(sha []byte) []byte {
	hash := []byte(fmt.Sprintf("%x", sha))
	hashUpper := []byte(fmt.Sprintf("%X", sha))
	if !containsUppercase(hash, s.NumberOfUpperCase) {
		i := 0
@@ -46,7 +48,7 @@ func (s *Site) applyCriteria(sha []byte) []byte {
		if matches = r.FindAllIndex(hash, -1); matches != nil {
			for _, v := range matches {
				if i < s.NumberOfUpperCase {
					c := strings.ToUpper(string(hash[v[0]]))
					c := string(hashUpper[v[0]])
					hash[v[0]] = []byte(c)[0]
					i += 1
				}
@@ -62,7 +64,8 @@ func (s *Site) applyCriteria(sha []byte) []byte {
		if matches = r.FindAllIndex(hash, -1); matches != nil {
			for _, v := range matches {
				if i < s.NumberOfDigits {
					hash[v[0]] = byte(i)
					ceiling := float64(10)
					hash[v[0]] = byte(ceiling - math.Mod(float64(i), ceiling) - 1)
					i += 1
				}
			}
@@ -72,13 +75,15 @@ func (s *Site) applyCriteria(sha []byte) []byte {
	if !containsSpecialCharacters(hash, s.SpecialCharacters, s.NumberOfSpecialCharacters) {
		i := 0
		r := regexp.MustCompile(`[0-9]+`)
		l := len(s.SpecialCharacters)
		var matches [][]int
		if matches = r.FindAllIndex(hash, -1); matches != nil {
			for _, v := range matches {
				if i < s.NumberOfSpecialCharacters {
					i += 1
					hash[v[0]] = []byte(s.SpecialCharacters)[len(s.SpecialCharacters)-i]
					idx := l - int(math.Mod(float64(i), float64(l)))
					hash[v[0]] = []byte(s.SpecialCharacters)[idx]
				}
			}
		}