Skip to content

Commit 91febbf

Browse files
HainishHainish
committed
Standardizing 2-space indentation for rest of the project
1 parent dac62c9 commit 91febbf

File tree

7 files changed

+253
-253
lines changed

7 files changed

+253
-253
lines changed

‎rewriter/rewriter.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
// git diff
1616

1717
var path = require("path"),
18-
fs = require("fs"),
19-
DOMParser = require('xmldom').DOMParser,
20-
readdirp = require('readdirp'),
21-
es = require('event-stream'),
18+
fs = require("fs"),
19+
DOMParser = require('xmldom').DOMParser,
20+
readdirp = require('readdirp'),
21+
es = require('event-stream'),
2222

23-
rules = require("../chromium/rules"),
23+
rules = require("../chromium/rules"),
2424

25-
URI = require("urijs");
25+
URI = require("urijs");
2626

2727
var ruleSets = null;
2828

@@ -35,26 +35,26 @@ function processDir(dir) {
3535
var stream = readdirp({
3636
root: dir,
3737
fileFilter: ['*.html', '*.js', '*.rb', '*.erb', '*.mustache',
38-
'*.scala', '*.c', '*.cc', '*.cpp', '*.cxx',
39-
'*.java', '*.go', '*.php', '*.css', '*.pl', '*.py',
40-
'*.rhtml', '*.sh', '*.yaml']
38+
'*.scala', '*.c', '*.cc', '*.cpp', '*.cxx',
39+
'*.java', '*.go', '*.php', '*.css', '*.pl', '*.py',
40+
'*.rhtml', '*.sh', '*.yaml']
4141
});
4242

4343
stream
44-
.on('warn', function (err) {
45-
console.error('non-fatal error', err);
44+
.on('warn', function (err) {
45+
console.error('non-fatal error', err);
4646
// Optionally call stream.destroy() here in order to abort and cause 'close' to be emitted
47-
})
48-
.on('error', function (err) { console.error('fatal error', err); })
49-
.pipe(es.mapSync(function (entry) {
50-
var filename = path.join(dir, entry.path);
51-
console.log("Rewriting " + filename);
52-
try {
53-
processFile(filename);
54-
} catch(e) {
55-
console.log(filename, e);
56-
}
57-
}));
47+
})
48+
.on('error', function (err) { console.error('fatal error', err); })
49+
.pipe(es.mapSync(function (entry) {
50+
var filename = path.join(dir, entry.path);
51+
console.log("Rewriting " + filename);
52+
try {
53+
processFile(filename);
54+
} catch(e) {
55+
console.log(filename, e);
56+
}
57+
}));
5858
}
5959

6060
/**

‎src/bootstrap.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const CC = Components.classes;
55

66
function get_prefs(branch_name){
77
let o_prefs = CC["@mozilla.org/preferences-service;1"]
8-
.getService(CI.nsIPrefService);
8+
.getService(CI.nsIPrefService);
99
let o_branch = o_prefs.getBranch(branch_name);
1010
return o_branch;
1111
}
@@ -14,9 +14,9 @@ function get_custom_rulesets_array(){
1414
var loc = "ProfD"; // profile directory
1515
var dir =
1616
CC["@mozilla.org/file/directory_service;1"]
17-
.getService(CI.nsIProperties)
18-
.get(loc, CI.nsILocalFile)
19-
.clone();
17+
.getService(CI.nsIProperties)
18+
.get(loc, CI.nsILocalFile)
19+
.clone();
2020
dir.append("HTTPSEverywhereUserRules");
2121
// Check for existence, if not, create.
2222
if (!dir.exists()) {
@@ -35,9 +35,9 @@ function get_custom_rulesets_array(){
3535
for(let file of files){
3636
var data = "";
3737
var fstream = CC["@mozilla.org/network/file-input-stream;1"]
38-
.createInstance(CI.nsIFileInputStream);
38+
.createInstance(CI.nsIFileInputStream);
3939
var sstream = CC["@mozilla.org/scriptableinputstream;1"]
40-
.createInstance(CI.nsIScriptableInputStream);
40+
.createInstance(CI.nsIScriptableInputStream);
4141
fstream.init(file, -1, 0, 0);
4242
sstream.init(fstream);
4343

‎utils/convert-hsts/index.js‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,59 +17,59 @@ _(push => {
1717
push(null, _.nil);
1818
});
1919
})
20-
.flatMap(_)
21-
.pipe(_.pipeline(
22-
base64.decode(),
23-
_.split(),
24-
_.filter(line => !/^\s*\/\//.test(line)),
25-
JSONStream.parse('entries.*')
26-
))
27-
.reduce({
28-
xml: xmlBuilder.create('rulesetlibrary'),
29-
rulesets: new Map(),
30-
greedyInclusions: '(?!)',
31-
potentialExclusions: new Map()
32-
}, (acc, { name, mode = '', include_subdomains = false }) => {
33-
if (mode === 'force-https') {
34-
const ruleset = acc.xml.ele('ruleset', { name });
35-
acc.rulesets.set(name, ruleset);
36-
ruleset.ele('target', {
37-
host: name
38-
});
39-
if (include_subdomains) {
40-
acc.greedyInclusions += `|${hostToRegex(name)}`;
20+
.flatMap(_)
21+
.pipe(_.pipeline(
22+
base64.decode(),
23+
_.split(),
24+
_.filter(line => !/^\s*\/\//.test(line)),
25+
JSONStream.parse('entries.*')
26+
))
27+
.reduce({
28+
xml: xmlBuilder.create('rulesetlibrary'),
29+
rulesets: new Map(),
30+
greedyInclusions: '(?!)',
31+
potentialExclusions: new Map()
32+
}, (acc, { name, mode = '', include_subdomains = false }) => {
33+
if (mode === 'force-https') {
34+
const ruleset = acc.xml.ele('ruleset', { name });
35+
acc.rulesets.set(name, ruleset);
4136
ruleset.ele('target', {
42-
host: `*.${name}`
43-
});
44-
}
45-
ruleset.ele('rule', {
46-
from: '^http:',
47-
to: 'https:'
48-
});
49-
} else {
50-
acc.potentialExclusions.set(name, include_subdomains);
51-
}
52-
return acc;
53-
})
54-
.map(acc => {
55-
const regexp = new RegExp(`\.(${acc.greedyInclusions})$`);
56-
for (const [ name, include_subdomains ] of acc.potentialExclusions) {
57-
const match = name.match(regexp);
58-
if (match) {
59-
const ruleset = acc.rulesets.get(match[1]);
60-
ruleset.ele('exclusion', {
61-
pattern: `^http://${include_subdomains ? '(?:[\\w-]+\\.)*' : ''}${hostToRegex(name)}/`
62-
});
63-
ruleset.ele('test', {
64-
url: `http://${name}/`
37+
host: name
6538
});
6639
if (include_subdomains) {
40+
acc.greedyInclusions += `|${hostToRegex(name)}`;
41+
ruleset.ele('target', {
42+
host: `*.${name}`
43+
});
44+
}
45+
ruleset.ele('rule', {
46+
from: '^http:',
47+
to: 'https:'
48+
});
49+
} else {
50+
acc.potentialExclusions.set(name, include_subdomains);
51+
}
52+
return acc;
53+
})
54+
.map(acc => {
55+
const regexp = new RegExp(`\.(${acc.greedyInclusions})$`);
56+
for (const [ name, include_subdomains ] of acc.potentialExclusions) {
57+
const match = name.match(regexp);
58+
if (match) {
59+
const ruleset = acc.rulesets.get(match[1]);
60+
ruleset.ele('exclusion', {
61+
pattern: `^http://${include_subdomains ? '(?:[\\w-]+\\.)*' : ''}${hostToRegex(name)}/`
62+
});
6763
ruleset.ele('test', {
68-
url: `http://host-part.${name}/`
64+
url: `http://${name}/`
6965
});
66+
if (include_subdomains) {
67+
ruleset.ele('test', {
68+
url: `http://host-part.${name}/`
69+
});
70+
}
7071
}
7172
}
72-
}
73-
return acc.xml.end({ pretty: true });
74-
})
75-
.pipe(fs.createWriteStream(`${__dirname}/hsts.xml`));
73+
return acc.xml.end({ pretty: true });
74+
})
75+
.pipe(fs.createWriteStream(`${__dirname}/hsts.xml`));

‎utils/hsts-prune/index.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const firefox_version_fetch = version_url => {
4141
return cb => {
4242
https.get(version_url, res => {
4343
cb(null, res.headers.location
44-
.match(/firefox-(.*).tar.*/)[1].replace(/\./g, "_"));
44+
.match(/firefox-(.*).tar.*/)[1].replace(/\./g, "_"));
4545
});
4646
};
4747
};
@@ -142,7 +142,7 @@ const check_header_directives = (check_domain, cb) => {
142142
max_age = Number(max_age_match[1]);
143143
}
144144
cb(null,
145-
preload && include_subdomains && max_age >= 10886400);
145+
preload && include_subdomains && max_age >= 10886400);
146146
sent_callback = true;
147147
} else {
148148
cb(null, false);
@@ -193,38 +193,38 @@ function remove_target_from_xml(source, target) {
193193

194194
const files =
195195
read_dir(rules_dir)
196-
.tap(rules => {
197-
bar = new ProgressBar(':bar', { total: rules.length, stream: process.stdout });
198-
})
199-
.sequence()
200-
.filter(name => {
201-
if(rulesets_changed){
202-
return ~rulesets_changed.indexOf(name);
203-
} else {
204-
return name.endsWith('.xml');
205-
}
206-
});
196+
.tap(rules => {
197+
bar = new ProgressBar(':bar', { total: rules.length, stream: process.stdout });
198+
})
199+
.sequence()
200+
.filter(name => {
201+
if(rulesets_changed){
202+
return ~rulesets_changed.indexOf(name);
203+
} else {
204+
return name.endsWith('.xml');
205+
}
206+
});
207207

208208
const sources =
209209
files.fork()
210-
.map(name => read_file(`${rules_dir}/${name}`, 'utf-8'))
211-
.parallel(10);
210+
.map(name => read_file(`${rules_dir}/${name}`, 'utf-8'))
211+
.parallel(10);
212212

213213
const rules =
214214
sources.fork()
215-
.flatMap(parse_xml)
216-
.errors((err, push) => {
217-
push(null, { err });
218-
})
219-
.zip(files.fork())
220-
.map(([ { ruleset, err }, name ]) => {
221-
if (err) {
222-
err.message += ` (${name})`;
223-
this.emit('error', err);
224-
} else {
225-
return ruleset;
226-
}
227-
});
215+
.flatMap(parse_xml)
216+
.errors((err, push) => {
217+
push(null, { err });
218+
})
219+
.zip(files.fork())
220+
.map(([ { ruleset, err }, name ]) => {
221+
if (err) {
222+
err.message += ` (${name})`;
223+
this.emit('error', err);
224+
} else {
225+
return ruleset;
226+
}
227+
});
228228

229229
// This async call determines the current versions of the supported browsers
230230

‎utils/labeller/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function get_most_recent_pr(alexa, recent_cb){
6565

6666
function github_process_prs(res, pr_cb){
6767
var alexa = res[0],
68-
most_recent_pr_checked = res[1];
68+
most_recent_pr_checked = res[1];
6969

7070
var github = new GitHubApi();
7171
var wildcard_www_regex = /^(www|\*)\.(.+)/

0 commit comments

Comments
 (0)