Skip to content
Snippets Groups Projects
Commit 4ef30a85 authored by Ben Adida's avatar Ben Adida
Browse files

Merge branch 'dev' into feature-certs

parents 4b6d199e 3ef380ed
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 494 additions and 330 deletions
browserid/compress.sh
+ 1
− 1
View file @ 4ef30a85
......@@ -45,7 +45,7 @@ echo ''
cd ../js
# re-minimize everything together
cat jquery-1.6.2.min.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-network.js ../dialog/resources/browserid-identities.js ../dialog/resources/storage.js browserid.js > lib.js
cat jquery-1.6.2.min.js json2.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-network.js ../dialog/resources/browserid-identities.js ../dialog/resources/storage.js browserid.js > lib.js
$UGLIFY < lib.js > lib.min.js
cd ../css
......
browserid/static/css/style.css
+ 5
− 3
View file @ 4ef30a85
......@@ -30,6 +30,7 @@ header {
height: 230px;
color #fff;
min-width: 800px;
display: block;
}
header.quarter {
......@@ -43,7 +44,7 @@ header.quarter {
width: 161px;
height: 34px;
margin: 10px 0 0 110px;
color: transparent;
font-size: 0px;
display: inline-block;
}
......@@ -56,7 +57,7 @@ header.quarter {
height: 72px;
margin: 43px auto 0 auto;
clear: left;
color: transparent;
font-size: 0px;
}
.quarter h1 {
......@@ -67,7 +68,7 @@ header.quarter {
}
.quarter h1 > a {
color: transparent;
font-size: 0px;
}
......@@ -153,6 +154,7 @@ footer {
padding: 0;
height: 200px;
font-size: 1.1em;
display: block;
}
footer > div {
......
browserid/static/css/style.css.bak deleted 100644 → 0
+ 0
− 322
View file @ 4b6d199e
@font-face {
font-family: 'Shadows Into Light';
font-style: normal;
font-weight: normal;
/* src: local('Shadows Into Light'), local('ShadowsIntoLight'), url('sil.ttf')
* format('truetype');*/
}
@font-face {
font-family: 'Tenor Sans';
font-style: normal;
font-weight: normal;
/* src: local('Tenor Sans'), local('TenorSans'), url('ts.ttf')
* format('truetype');*/
}
body {
padding: 0;
margin: 0;
font-size: 12px;
font-family: 'Tenor Sans', arial, serif;
}
header {
border-top: 4px solid #333;
background-color: #333;
padding: 0 20% 0 20%;
margin: 0;
background: #008;
height: 230px;
color #fff;
min-width: 800px;
}
header.quarter {
height: 50px;
}
#labslogo {
margin: auto;
text-align: left;
background: url("/i/labs-logo.png") 0 0 no-repeat;
width: 161px;
height: 34px;
margin: 10px 0 0 110px;
color: transparent;
display: inline-block;
}
.half h1 {
padding-top: .2em;
font-size: 3em;
font-weight: bold;
background: url("/i/browserid_logo.png") 0 0 no-repeat;
width: 366px;
height: 72px;
margin: 43px auto 0 auto;
clear: left;
color: transparent;
}
.quarter h1 {
float: left;
width: 135px;
height: 35px;
margin: 7px 0 0 10px;
}
.quarter h1 > a {
color: transparent;
}
h2 {
font-family: 'Shadows Into Light', arial, serif;
font-size: 3em;
font-weight: normal;
color: #fff;
margin: -4px auto 0 auto;
text-align: center;
}
.quarter h2 {
font-size: 2em;
margin: .2em 0 0 .5em;
float: left;
}
header > #manageLink {
float: right;
background-color: #333;
color: #fff;
padding: 1px 10px 5px 10px;
-webkit-border-radius: 0 0 10px 10px;
-moz-border-radius: 0 0 10px 10px;
border-radius: 0 0 10px 10px;
display: none;
}
.authenticated header > #manageLink {
display: block;
}
header > #manageLink:hover {
opacity:1;
color: #AAA;
}
.why {
width: 600px;
height: 130px;
padding: 10px 0;
margin: 0 auto;
}
.why p {
font-size: 2em;
text-align: center;
}
.why a, #cancellink {
color: #666;
text-decoration: none;
border-bottom: 1px dotted black;
}
.why a:hover {
color: #000;
opacity: 1;
}
a {
color: #fff;
text-decoration: none;
}
a:hover {
opacity: .6;
}
footer {
background-color: #F1F1F1;
border-top: 2px solid #ddd;
margin: 0;
margin-top: 100px;
padding: 0;
height: 200px;
font-size: 1.1em;
}
footer > div {
width: 800px;
margin: auto;
}
footer > div > div {
width: 400px;
padding: 10px;
}
footer .right {
padding-top: 13px;
float: right;
}
footer .right img {
margin-bottom: -5px;
}
footer a {
color: #666;
}
footer .right p {
text-align: right;
}
footer .copyright {
font-weight: bold;
font-size: .8em;
}
#steps {
list-style: none;
width: 800px;
margin: 0 auto;
padding: 0;
}
#steps a {
color: #666;
text-decoration: none;
border-bottom: 1px dotted #666;
}
.step {
margin: 1em 0 2em 0;
padding: 0 0 0 50px;
font-size: 14px;
position: relative;
}
.step .number {
position: absolute;
top: -5px;
left: 0;
font-family: 'Shadows Into Light', arial, serif;
font-size: 4em;
font-weight: bold;
line-height: 1em;
}
.step > h3 {
font-size: 1em;
margin: 0;
display: inline;
}
.step > pre {
clear: both;
}
.step > p, .step > ol {
margin-left: 50px;
}
.prose {
font-size: 1.5em;
}
.status {
margin: 0 auto;
width: 600px;
font-size: 1.2em;
}
pre code {
padding: 10px 15px 10px 15px;
margin: .75em;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px 10px 10px 10px;
width: 650px;
}
#emailList {
font-size: 1.0em;
width: 4x00px;
margin: auto;
font-weight:bold;
margin-top:32px;
}
#cancelaccount {
font-size: 1.0em;
width: 500px;
margin: auto;
margin-top:35px;
}
.email {
display:inline-block;
}
.emailblock a {
font-size:0.7em;
color:#405090;
}
.emailblock {
border: 1px solid #ddd;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background-color:#f0f0f0;
width:500px;
padding:8px;
min-height:48px;
margin:16px auto;
}
.meta {
display:inline-block;
float:right;
font:8pt Arial;
}
.meta a {
cursor:pointer;
}
.keyblock {
font:8pt Arial;
}
.date {
font:8pt Arial;
}
.buttonbox {
height: 25px;
width: 460px;
margin: auto;
}
.buttonbox > div {
float: left;
margin-right: 10px;
}
.legal {
font-size: 1.3em;
width: 800px;
margin: 0 auto;
}
.legal li {
margin-bottom: 7px;
}
.legal h5 {
margin-bottom: 1px;
padding-bottom: 1px;
line-height: 100%;
}
.legal p {
margin-top : 1px;
}
browserid/static/dialog/style.css
+ 2
− 2
View file @ 4ef30a85
......@@ -250,7 +250,7 @@ div.dialog div.attention_lame {
#logo {
background-position: 0 -26px;;
color: transparent;
font-size: 0px;
width: 135px;
height: 35px;
margin: 2px 16px 0 16px;
......@@ -259,7 +259,7 @@ div.dialog div.attention_lame {
#subtitle {
margin: 8px 0 0;
color: transparent;
font-size: 0px;
background-position: 0 0;
width: 146px;
height: 25px;
......
browserid/static/js/json2.js 0 → 100644
+ 480
− 0
View file @ 4ef30a85
/*
http://www.JSON.org/json2.js
2011-02-23
Public Domain.
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
See http://www.JSON.org/js.html
This code should be minified before deployment.
See http://javascript.crockford.com/jsmin.html
USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
NOT CONTROL.
This file creates a global JSON object containing two methods: stringify
and parse.
JSON.stringify(value, replacer, space)
value any JavaScript value, usually an object or array.
replacer an optional parameter that determines how object
values are stringified for objects. It can be a
function or an array of strings.
space an optional parameter that specifies the indentation
of nested structures. If it is omitted, the text will
be packed without extra whitespace. If it is a number,
it will specify the number of spaces to indent at each
level. If it is a string (such as '\t' or '&nbsp;'),
it contains the characters used to indent at each level.
This method produces a JSON text from a JavaScript value.
When an object value is found, if the object contains a toJSON
method, its toJSON method will be called and the result will be
stringified. A toJSON method does not serialize: it returns the
value represented by the name/value pair that should be serialized,
or undefined if nothing should be serialized. The toJSON method
will be passed the key associated with the value, and this will be
bound to the value
For example, this would serialize Dates as ISO strings.
Date.prototype.toJSON = function (key) {
function f(n) {
// Format integers to have at least two digits.
return n < 10 ? '0' + n : n;
}
return this.getUTCFullYear() + '-' +
f(this.getUTCMonth() + 1) + '-' +
f(this.getUTCDate()) + 'T' +
f(this.getUTCHours()) + ':' +
f(this.getUTCMinutes()) + ':' +
f(this.getUTCSeconds()) + 'Z';
};
You can provide an optional replacer method. It will be passed the
key and value of each member, with this bound to the containing
object. The value that is returned from your method will be
serialized. If your method returns undefined, then the member will
be excluded from the serialization.
If the replacer parameter is an array of strings, then it will be
used to select the members to be serialized. It filters the results
such that only members with keys listed in the replacer array are
stringified.
Values that do not have JSON representations, such as undefined or
functions, will not be serialized. Such values in objects will be
dropped; in arrays they will be replaced with null. You can use
a replacer function to replace those with JSON values.
JSON.stringify(undefined) returns undefined.
The optional space parameter produces a stringification of the
value that is filled with line breaks and indentation to make it
easier to read.
If the space parameter is a non-empty string, then that string will
be used for indentation. If the space parameter is a number, then
the indentation will be that many spaces.
Example:
text = JSON.stringify(['e', {pluribus: 'unum'}]);
// text is '["e",{"pluribus":"unum"}]'
text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
// text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
text = JSON.stringify([new Date()], function (key, value) {
return this[key] instanceof Date ?
'Date(' + this[key] + ')' : value;
});
// text is '["Date(---current time---)"]'
JSON.parse(text, reviver)
This method parses a JSON text to produce an object or array.
It can throw a SyntaxError exception.
The optional reviver parameter is a function that can filter and
transform the results. It receives each of the keys and values,
and its return value is used instead of the original value.
If it returns what it received, then the structure is not modified.
If it returns undefined then the member is deleted.
Example:
// Parse the text. Values that look like ISO date strings will
// be converted to Date objects.
myData = JSON.parse(text, function (key, value) {
var a;
if (typeof value === 'string') {
a =
/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
if (a) {
return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+a[5], +a[6]));
}
}
return value;
});
myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
var d;
if (typeof value === 'string' &&
value.slice(0, 5) === 'Date(' &&
value.slice(-1) === ')') {
d = new Date(value.slice(5, -1));
if (d) {
return d;
}
}
return value;
});
This is a reference implementation. You are free to copy, modify, or
redistribute.
*/
/*jslint evil: true, strict: false, regexp: false */
/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
lastIndex, length, parse, prototype, push, replace, slice, stringify,
test, toJSON, toString, valueOf
*/
// Create a JSON object only if one does not already exist. We create the
// methods in a closure to avoid creating global variables.
var JSON;
if (!JSON) {
JSON = {};
}
(function () {
"use strict";
function f(n) {
// Format integers to have at least two digits.
return n < 10 ? '0' + n : n;
}
if (typeof Date.prototype.toJSON !== 'function') {
Date.prototype.toJSON = function (key) {
return isFinite(this.valueOf()) ?
this.getUTCFullYear() + '-' +
f(this.getUTCMonth() + 1) + '-' +
f(this.getUTCDate()) + 'T' +
f(this.getUTCHours()) + ':' +
f(this.getUTCMinutes()) + ':' +
f(this.getUTCSeconds()) + 'Z' : null;
};
String.prototype.toJSON =
Number.prototype.toJSON =
Boolean.prototype.toJSON = function (key) {
return this.valueOf();
};
}
var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
gap,
indent,
meta = { // table of character substitutions
'\b': '\\b',
'\t': '\\t',
'\n': '\\n',
'\f': '\\f',
'\r': '\\r',
'"' : '\\"',
'\\': '\\\\'
},
rep;
function quote(string) {
// If the string contains no control characters, no quote characters, and no
// backslash characters, then we can safely slap some quotes around it.
// Otherwise we must also replace the offending characters with safe escape
// sequences.
escapable.lastIndex = 0;
return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
var c = meta[a];
return typeof c === 'string' ? c :
'\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
}) + '"' : '"' + string + '"';
}
function str(key, holder) {
// Produce a string from holder[key].
var i, // The loop counter.
k, // The member key.
v, // The member value.
length,
mind = gap,
partial,
value = holder[key];
// If the value has a toJSON method, call it to obtain a replacement value.
if (value && typeof value === 'object' &&
typeof value.toJSON === 'function') {
value = value.toJSON(key);
}
// If we were called with a replacer function, then call the replacer to
// obtain a replacement value.
if (typeof rep === 'function') {
value = rep.call(holder, key, value);
}
// What happens next depends on the value's type.
switch (typeof value) {
case 'string':
return quote(value);
case 'number':
// JSON numbers must be finite. Encode non-finite numbers as null.
return isFinite(value) ? String(value) : 'null';
case 'boolean':
case 'null':
// If the value is a boolean or null, convert it to a string. Note:
// typeof null does not produce 'null'. The case is included here in
// the remote chance that this gets fixed someday.
return String(value);
// If the type is 'object', we might be dealing with an object or an array or
// null.
case 'object':
// Due to a specification blunder in ECMAScript, typeof null is 'object',
// so watch out for that case.
if (!value) {
return 'null';
}
// Make an array to hold the partial results of stringifying this object value.
gap += indent;
partial = [];
// Is the value an array?
if (Object.prototype.toString.apply(value) === '[object Array]') {
// The value is an array. Stringify every element. Use null as a placeholder
// for non-JSON values.
length = value.length;
for (i = 0; i < length; i += 1) {
partial[i] = str(i, value) || 'null';
}
// Join all of the elements together, separated with commas, and wrap them in
// brackets.
v = partial.length === 0 ? '[]' : gap ?
'[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
'[' + partial.join(',') + ']';
gap = mind;
return v;
}
// If the replacer is an array, use it to select the members to be stringified.
if (rep && typeof rep === 'object') {
length = rep.length;
for (i = 0; i < length; i += 1) {
if (typeof rep[i] === 'string') {
k = rep[i];
v = str(k, value);
if (v) {
partial.push(quote(k) + (gap ? ': ' : ':') + v);
}
}
}
} else {
// Otherwise, iterate through all of the keys in the object.
for (k in value) {
if (Object.prototype.hasOwnProperty.call(value, k)) {
v = str(k, value);
if (v) {
partial.push(quote(k) + (gap ? ': ' : ':') + v);
}
}
}
}
// Join all of the member texts together, separated with commas,
// and wrap them in braces.
v = partial.length === 0 ? '{}' : gap ?
'{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
'{' + partial.join(',') + '}';
gap = mind;
return v;
}
}
// If the JSON object does not yet have a stringify method, give it one.
if (typeof JSON.stringify !== 'function') {
JSON.stringify = function (value, replacer, space) {
// The stringify method takes a value and an optional replacer, and an optional
// space parameter, and returns a JSON text. The replacer can be a function
// that can replace values, or an array of strings that will select the keys.
// A default replacer method can be provided. Use of the space parameter can
// produce text that is more easily readable.
var i;
gap = '';
indent = '';
// If the space parameter is a number, make an indent string containing that
// many spaces.
if (typeof space === 'number') {
for (i = 0; i < space; i += 1) {
indent += ' ';
}
// If the space parameter is a string, it will be used as the indent string.
} else if (typeof space === 'string') {
indent = space;
}
// If there is a replacer, it must be a function or an array.
// Otherwise, throw an error.
rep = replacer;
if (replacer && typeof replacer !== 'function' &&
(typeof replacer !== 'object' ||
typeof replacer.length !== 'number')) {
throw new Error('JSON.stringify');
}
// Make a fake root object containing our value under the key of ''.
// Return the result of stringifying the value.
return str('', {'': value});
};
}
// If the JSON object does not yet have a parse method, give it one.
if (typeof JSON.parse !== 'function') {
JSON.parse = function (text, reviver) {
// The parse method takes a text and an optional reviver function, and returns
// a JavaScript value if the text is a valid JSON text.
var j;
function walk(holder, key) {
// The walk method is used to recursively walk the resulting structure so
// that modifications can be made.
var k, v, value = holder[key];
if (value && typeof value === 'object') {
for (k in value) {
if (Object.prototype.hasOwnProperty.call(value, k)) {
v = walk(value, k);
if (v !== undefined) {
value[k] = v;
} else {
delete value[k];
}
}
}
}
return reviver.call(holder, key, value);
}
// Parsing happens in four stages. In the first stage, we replace certain
// Unicode characters with escape sequences. JavaScript handles many characters
// incorrectly, either silently deleting them, or treating them as line endings.
text = String(text);
cx.lastIndex = 0;
if (cx.test(text)) {
text = text.replace(cx, function (a) {
return '\\u' +
('0000' + a.charCodeAt(0).toString(16)).slice(-4);
});
}
// In the second stage, we run the text against regular expressions that look
// for non-JSON patterns. We are especially concerned with '()' and 'new'
// because they can cause invocation, and '=' because it can cause mutation.
// But just to be safe, we want to reject all unexpected forms.
// We split the second stage into 4 regexp operations in order to work around
// crippling inefficiencies in IE's and Safari's regexp engines. First we
// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
// replace all simple value tokens with ']' characters. Third, we delete all
// open brackets that follow a colon or comma or that begin the text. Finally,
// we look to see that the remaining characters are only whitespace or ']' or
// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
if (/^[\],:{}\s]*$/
.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
.replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
// In the third stage we use the eval function to compile the text into a
// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
// in JavaScript: it can begin a block or an object literal. We wrap the text
// in parens to eliminate the ambiguity.
j = eval('(' + text + ')');
// In the optional fourth stage, we recursively walk the new structure, passing
// each name/value pair to a reviver function for possible transformation.
return typeof reviver === 'function' ?
walk({'': j}, '') : j;
}
// If the text is not JSON parseable, then a SyntaxError is thrown.
throw new SyntaxError('JSON.parse');
};
}
}());
browserid/views/dialog.ejs
+ 1
− 1
View file @ 4ef30a85
......@@ -2,7 +2,7 @@
<html>
<head>
<!--[if lt IE 9]>
<script src="/dialog/html5shim.js"></script>
<script src="/js/html5shim.js"></script>
<![endif]-->
<title>Browser ID</title>
</head>
......
browserid/views/layout.ejs
+ 4
− 0
View file @ 4ef30a85
......@@ -3,6 +3,9 @@
<head>
<meta charset="utf-8">
<title><%- title %></title>
<!--[if lt IE 9]>
<script src="/js/html5shim.js"></script>
<![endif]-->
<% if (production) { %>
<link rel="stylesheet" type="text/css" href="/css/browserid.min.css">
<script src="/js/lib.min.js" type="text/javascript"></script>
......@@ -10,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="/css/github.css">
<link rel="stylesheet" type="text/css" href="/css/style.css">
<script src="/js/jquery-1.6.2.min.js" type="text/javascript"></script>
<script src="/js/json2.js" type="text/javascript"></script>
<script src="/dialog/resources/storage.js" type="text/javascript"></script>
<script src="/dialog/resources/browserid-network.js" type="text/javascript"></script>
<script src="/dialog/resources/browserid-identities.js" type="text/javascript"></script>
......
run.js
+ 1
− 1
View file @ 4ef30a85
......@@ -51,7 +51,7 @@ require('./libs/logging.js').enableConsoleLogging();
var configuration = require('./libs/configuration.js');
var PRIMARY_HOST = "127.0.0.1";
var PRIMARY_HOST = process.env.IP_ADDRESS || "127.0.0.1";
var boundServers = [ ];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment