Home Explore Help
Sign In
RevolvingCow
/
enigma
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 18 Releases 0 Wiki
Browse Source

added salt and removed test html files

bmallred 10 years ago
parent
1d2edad0bd
commit
e3e2ce45b4
6 changed files with 15 additions and 345 deletions
Split View Show Diff Stats
  1. 0 259
      book.html
  2. 3 1
      handlers.go
  3. 0 82
      index.html
  4. 2 1
      main_test.go
  5. 6 0
      resources.go
  6. 4 2
      site.go

+ 0 - 259
book.html
View File 

@ -1,259 +0,0 @@
1 
<!doctype html>
2 
<html lang="en">
3 
<head>
4 
    <meta charset="utf-8">
5 
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 
    <meta name="viewport" content="width=device-width, initial-scale=1">
7
8 
    <title>Enigma</title>
9
10 
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" />
11 
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css" />
12 
    <style type="text/css">
13 
        body {
14 
            padding-top: 40px;
15 
            padding-bottom: 40px;
16 
            background-color: #fff;
17 
        }
18 
        h2 {
19 
            margin-bottom: 1em;
20 
        }
21 
        td {
22 
            text-align: left;
23 
            vertical-align: middle !important;
24 
        }
25 
        .tab-content > .tab-pane {
26 
            padding: 1em;
27 
        }
28 
    </style>
29
30 
    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
31 
    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
32 
    <!--[if lt IE 9]>
33 
        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
34 
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
35 
    <![endif]-->
36 
</head>
37 
<body>
38 
    <div class="container">
39 
        <h1>Enigma</h1>
40 
        <h2><small>Your personal password safe and generator</small></h2>
41
42 
        <div role="tabpanel">
43 
            <ul class="nav nav-tabs" role="tablist">
44 
                <li role="presentation" class="active"><a href="#passwords" aria-controls="passwords" role="tab" data-toggle="tab">Passwords</a></li>
45 
                <li role="presentation"><a href="#add" aria-controls="Add" role="tab" data-toggle="tab">Add</a></li>
46 
                <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Settings</a></li>
47 
            </ul>
48 
            <div class="tab-content">
49 
                <div role="tabpanel" class="tab-pane active" id="passwords">
50 
                    <table class="table table-striped table-hover">
51 
                        <thead>
52 
                            <tr>
53 
                                <th>Site</th>
54 
                                <th>Password</th>
55 
                                <th>&nbsp;</th>
56 
                            </tr>
57 
                        </thead>
58 
                        <tbody>
59 
                            <tr>
60 
                                <td>google.com</td>
61 
                                <td>
62 
                                    <button class="btn btn-default btn-xs"><span class="glyphicon glyphicon-share" aria-hidden="true"></span></button>
63 
                                    <form class="form form-horizontal" style="display: inline-block;" action="http://localhost:8080/api/refresh" method="post">
64 
                                        <input name="profile" type="hidden" />
65 
                                        <input name="p" type="hidden" />
66 
                                        <input name="host" type="hidden" />
67 
                                        <button class="btn btn-default btn-xs"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></button>
68 
                                    </form>
69 
                                    <span>jfkle3r0934uf09jeafasdfjkajdf</span>
70 
                                </td>
71 
                                <td class="text-right">
72 
                                    <form class="form form-horizontal" action="http://localhost:8080/api/remove" method="post">
73 
                                        <input name="profile" type="hidden" />
74 
                                        <input name="p" type="hidden" />
75 
                                        <input name="host" type="hidden" />
76 
                                        <button class="btn btn-default"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
77 
                                    </form>
78 
                                </td>
79 
                            </tr>
80 
                            <tr>
81 
                                <td>yahoo.com</td>
82 
                                <td>
83 
                                    <button class="btn btn-default btn-xs"><span class="glyphicon glyphicon-share" aria-hidden="true"></span></button>
84 
                                    <form class="form form-horizontal" style="display: inline-block;" action="http://localhost:8080/api/refresh" method="post">
85 
                                        <input name="profile" type="hidden" />
86 
                                        <input name="p" type="hidden" />
87 
                                        <input name="host" type="hidden" />
88 
                                        <button class="btn btn-default btn-xs"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></button>
89 
                                    </form>
90 
                                    <span>jfkle3r0934uf09jeafasdfjkajdf</span>
91 
                                </td>
92 
                                <td class="text-right">
93 
                                    <form class="form form-horizontal" action="http://localhost:8080/api/remove" method="post">
94 
                                        <input name="profile" type="hidden" />
95 
                                        <input name="p" type="hidden" />
96 
                                        <input name="host" type="hidden" />
97 
                                        <button class="btn btn-default"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
98 
                                    </form>
99 
                                </td>
100 
                            </tr>
101 
                        </tbody>
102 
                    </table>
103 
                </div>
104 
                <div role="tabpanel" class="tab-pane" id="add">
105 
                    <form class="form form-horizontal" action="http://localhost:8080/api/generate" method="post">
106 
                        <input name="profile" type="hidden" />
107 
                        <input name="p" type="hidden" />
108 
                        <div class="form-group">
109 
                            <label for="host" class="col-xs-3 control-label">Site</label>
110 
                            <div class="col-xs-9">
111 
                                <input id="host" name="host" type="text" class="form-control" placeholder="gmail.com" />
112 
                            </div>
113 
                        </div>
114 
                        <div class="form-group">
115 
                            <label for="minimumLength" class="col-xs-3 control-label">Minimum Length</label>
116 
                            <div class="col-xs-3">
117 
                                <select id="minimumLength" name="minimumLength" class="form-control">
118 
                                    <option value="-1">No Limit</option>
119 
                                    <option>1</option>
120 
                                    <option>2</option>
121 
                                    <option>3</option>
122 
                                    <option>4</option>
123 
                                    <option>5</option>
124 
                                    <option>6</option>
125 
                                    <option>7</option>
126 
                                    <option>8</option>
127 
                                    <option>9</option>
128 
                                    <option>10</option>
129 
                                </select>
130 
                            </div>
131 
                        </div>
132 
                        <div class="form-group">
133 
                            <label for="maximumLength" class="col-xs-3 control-label">Maximum Length</label>
134 
                            <div class="col-xs-3">
135 
                                <select id="maximumLength" name="maximumLength" class="form-control">
136 
                                    <option value="-1">No Limit</option>
137 
                                    <option>4</option>
138 
                                    <option>5</option>
139 
                                    <option>6</option>
140 
                                    <option>7</option>
141 
                                    <option>8</option>
142 
                                    <option>9</option>
143 
                                    <option>10</option>
144 
                                    <option>11</option>
145 
                                    <option>12</option>
146 
                                    <option>13</option>
147 
                                    <option>14</option>
148 
                                    <option>15</option>
149 
                                    <option>16</option>
150 
                                    <option>17</option>
151 
                                    <option>18</option>
152 
                                    <option>19</option>
153 
                                    <option>20</option>
154 
                                </select>
155 
                            </div>
156 
                        </div>
157 
                        <div class="form-group">
158 
                            <label for="minimumDigits" class="col-xs-3 control-label">Minimum Digits</label>
159 
                            <div class="col-xs-3">
160 
                                <select id="minimumDigits" name="minimumLength" class="form-control">
161 
                                    <option>0</option>
162 
                                    <option>1</option>
163 
                                    <option>2</option>
164 
                                    <option>3</option>
165 
                                    <option>4</option>
166 
                                    <option>5</option>
167 
                                    <option>6</option>
168 
                                    <option>7</option>
169 
                                    <option>8</option>
170 
                                    <option>9</option>
171 
                                    <option>10</option>
172 
                                </select>
173 
                            </div>
174 
                        </div>
175 
                        <div class="form-group">
176 
                            <label for="minimumUppercase" class="col-xs-3 control-label">Minimum Uppercase</label>
177 
                            <div class="col-xs-3">
178 
                                <select id="minimumUppercase" name="minimumUppercase" class="form-control">
179 
                                    <option>0</option>
180 
                                    <option>1</option>
181 
                                    <option>2</option>
182 
                                    <option>3</option>
183 
                                    <option>4</option>
184 
                                    <option>5</option>
185 
                                    <option>6</option>
186 
                                    <option>7</option>
187 
                                    <option>8</option>
188 
                                    <option>9</option>
189 
                                    <option>10</option>
190 
                                </select>
191 
                            </div>
192 
                        </div>
193 
                        <div class="form-group">
194 
                            <label for="minimumSpecialCharacters" class="col-xs-3 control-label">Minimum Special Characters</label>
195 
                            <div class="col-xs-3">
196 
                                <select id="minimumSpecialCharacters" name="minimumSpecialCharacters" class="form-control">
197 
                                    <option>0</option>
198 
                                    <option>1</option>
199 
                                    <option>2</option>
200 
                                    <option>3</option>
201 
                                    <option>4</option>
202 
                                    <option>5</option>
203 
                                    <option>6</option>
204 
                                    <option>7</option>
205 
                                    <option>8</option>
206 
                                    <option>9</option>
207 
                                    <option>10</option>
208 
                                </select>
209 
                            </div>
210 
                        </div>
211 
                        <div class="form-group">
212 
                            <label for="specialCharacters" class="col-xs-3 control-label">Special Characters</label>
213 
                            <div class="col-xs-9">
214 
                                <input id="specialCharacters" name="specialCharacters" type="text" class="form-control" value=" !@#$%^&*()_+-=<>,." />
215 
                            </div>
216 
                        </div>
217 
                        <div class="form-group">
218 
                            <div class="col-xs-offset-3 col-xs-10">
219 
                                <button type="submit" class="btn btn-default">Generate Password</button>
220 
                            </div>
221 
                        </div>
222 
                    </form>
223 
                </div>
224 
                <div role="tabpanel" class="tab-pane" id="settings">
225 
                    <div class="row">
226 
                        <form class="form form-horizontal" action="http://localhost:8080/api/update" method="post">
227 
                            <input name="profile" type="hidden" />
228 
                            <input name="p" type="hidden" />
229 
                            <div class="form-group">
230 
                                <label for="newPassphrase" class="col-xs-3 control-label">New passphrase</label>
231 
                                <div class="col-xs-9">
232 
                                    <input id="newPassphrase" type="password" class="form-control" placeholder="" />
233 
                                </div>
234 
                            </div>
235 
                            <div class="form-group">
236 
                                <label for="confirmPassphrase" class="col-xs-3 control-label">Confirm passphrase</label>
237 
                                <div class="col-xs-9">
238 
                                    <input id="confirmPassphrase" type="password" class="form-control" placeholder="" />
239 
                                </div>
240 
                            </div>
241 
                            <div class="form-group">
242 
                                <div class="col-xs-offset-3 col-xs-6">
243 
                                    <button name="cmd" value="update" type="submit" class="btn btn-default">Update Passphrase</button>
244 
                                </div>
245 
                                <div class="col-xs-3 text-right">
246 
                                    <button name="cmd" value="delete" type="submit" class="btn btn-danger">Delete Profile</button>
247 
                                </div>
248 
                            </div>
249 
                        </form>
250 
                    </div>
251 
                </div>
252 
            </div>
253 
        </div>
254 
    </div>
255
256 
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
257 
    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
258 
</body>
259 
</html>

+ 3 - 1
handlers.go
View File 

@ -20,6 +20,7 @@ func GenerateHandler(w http.ResponseWriter, r *http.Request) {
20 20 
	profile := r.FormValue("profile")
21 21 
	passphrase := r.FormValue("p")
22 22 
	host := r.FormValue("host")
23 
	salt := r.FormValue("salt")
23 24 
	minimumLength, _ := strconv.Atoi(r.FormValue("minimumLength"))
24 25 
	maximumLength, _ := strconv.Atoi(r.FormValue("maximumLength"))
25 26 
	minimumDigits, _ := strconv.Atoi(r.FormValue("minimumDigits"))
 
@ -53,6 +54,7 @@ func GenerateHandler(w http.ResponseWriter, r *http.Request) {
53 54 
		NumberOfSpecialCharacters: minimumSpecialCharacters,
54 55 
		NumberOfDigits:            minimumDigits,
55 56 
		NumberOfUpperCase:         minimumUppercase,
57 
		PseudoSalt:                salt,
56 58 
		Revision:                  0,
57 59 
	}
58 60 
@ -257,7 +259,7 @@ func BookHandler(w http.ResponseWriter, r *http.Request) {
257 259 
		return
258 260 
	}
259 261 
	for i, s := range sites {
260 
		p := s.generatePassphrase(profile, passphrase)
262 
		p := s.generatePassphrase(profile, passphrase, s.PseudoSalt)
261 263 
		sites[i].Password = fmt.Sprintf("%s", string(p))
262 264 
	}
263 265

+ 0 - 82
index.html
View File 

@ -1,82 +0,0 @@
1 
<!doctype html>
2 
<html lang="en">
3 
<head>
4 
    <meta charset="utf-8">
5 
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 
    <meta name="viewport" content="width=device-width, initial-scale=1">
7
8 
    <title>Enigma Login</title>
9
10 
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" />
11 
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css" />
12 
    <style type="text/css">
13 
        body {
14 
            padding-top: 40px;
15 
            padding-bottom: 40px;
16 
            background-color: #eee;
17 
        }
18
19 
        .form-signin {
20 
            max-width: 330px;
21 
            padding: 15px;
22 
            margin: 0 auto;
23 
        }
24 
        .form-signin .form-signin-heading,
25 
        .form-signin .checkbox {
26 
            margin-bottom: 10px;
27 
        }
28 
        .form-signin .checkbox {
29 
            font-weight: normal;
30 
        }
31 
        .form-signin .form-control {
32 
            position: relative;
33 
            height: auto;
34 
            -webkit-box-sizing: border-box;
35 
            -moz-box-sizing: border-box;
36 
            box-sizing: border-box;
37 
            padding: 10px;
38 
            font-size: 16px;
39 
        }
40 
        .form-signin .form-control:focus {
41 
            z-index: 2;
42 
        }
43 
        .form-signin input[type="email"] {
44 
            margin-bottom: -1px;
45 
            border-bottom-right-radius: 0;
46 
            border-bottom-left-radius: 0;
47 
        }
48 
        .form-signin input[type="password"] {
49 
            margin-bottom: 10px;
50 
            border-top-left-radius: 0;
51 
            border-top-right-radius: 0;
52 
        }
53 
    </style>
54
55 
    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
56 
    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
57 
    <!--[if lt IE 9]>
58 
        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
59 
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
60 
    <![endif]-->
61 
</head>
62 
<body>
63 
    <div class="container">
64 
        <form action="/" method="post" class="form-signin">
65 
            <h2 class="form-signin-heading">Please sign in</h2>
66 
            <label for="profile" class="sr-only">Email address</label>
67 
            <input type="text" id="profile" name="profile" class="form-control" placeholder="Username" required autofocus>
68 
            <label for="p" class="sr-only">Password</label>
69 
            <input type="password" id="p" name="p" class="form-control" placeholder="Password" required>
70 
            <div class="checkbox">
71 
                <label>
72 
                    <input type="checkbox" value="remember-me"> Remember me
73 
                </label>
74 
            </div>
75 
            <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
76 
        </form>
77 
    </div>
78
79 
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
80 
    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
81 
</body>
82 
</html>

+ 2 - 1
main_test.go
View File 

@ -16,12 +16,13 @@ func TestGeneratePassphrase(t *testing.T) {
16 16 
		NumberOfSpecialCharacters: 2,
17 17 
		NumberOfDigits:            2,
18 18 
		NumberOfUpperCase:         1,
19 
		PseudoSalt:                "",
19 20 
	}
20 21 
	i := 0
21 22
22 23 
	expected := "Ce\\41ae|dc001da138"
23 24 
	for i = 0; i < 2; i++ {
24 
		b := site.generatePassphrase(profile, passphrase)
25 
		b := site.generatePassphrase(profile, passphrase, site.PseudoSalt)
25 26 
		actual := fmt.Sprintf("%s", string(b))
26 27 
		if actual != expected {
27 28 
			t.FailNow()

+ 6 - 0
resources.go
View File 

@ -285,6 +285,12 @@ const (
285 285 
                                <input id="specialCharacters" name="specialCharacters" type="text" class="form-control" value=" !@#$%^&*_+-=,." />
286 286 
                            </div>
287 287 
                        </div>
288 
                        <div class="form-group">
289 
                            <label for="salt" class="col-xs-3 control-label">Salt</label>
290 
                            <div class="col-xs-9">
291 
                                <input id="salt" name="salt" type="text" class="form-control" value="" />
292 
                            </div>
293 
                        </div>
288 294 
                        <div class="form-group">
289 295 
                            <div class="col-xs-offset-3 col-xs-10">
290 296 
								<button type="submit" class="btn btn-default" title="Generate a new site password">Generate Password</button>

+ 4 - 2
site.go
View File 

@ -18,13 +18,15 @@ type Site struct {
18 18 
	NumberOfUpperCase         int    `json:numberOfUpperCase`
19 19 
	NumberOfDigits            int    `json:numberOfDigits`
20 20 
	Revision                  int    `json:revision`
21 
	PseudoSalt                string `json:salt,omitempty`
21 22 
	Password                  string `json:",omitempty"`
22 23 
}
23 24
24 25 
// Generate the passphrase
25 
func (s *Site) generatePassphrase(profile, passphrase string) []byte {
26 
func (s *Site) generatePassphrase(profile, passphrase, salt string) []byte {
26 27 
	clearText := fmt.Sprintf(
27 
		"%s-%s-%s-%s",
28 
		"%s%s-%s-%s-%s",
29 
		salt,
28 30 
		strings.ToLower(profile),
29 31 
		strings.ToLower(passphrase),
30 32 
		strings.ToLower(s.Host),