flanchan
/
doushio
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'Remove tripcodes (for now)' (#1) from Mil/doushio:no-ffi into master

Browse Source 
Reviewed-on: #1
fix-tripcode
Avril 2 years ago
parent 6d5460ece6 1ae95bd4a4
commit 70a2dddb6e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File

3
package.json
Unescape View File

@ -22,9 +22,8 @@
"chart.js": "^2.7.2", "chart.js": "^2.7.2",
"diskspace": "^2.0.0", "diskspace": "^2.0.0",
"formidable": "1.0.17", "formidable": "1.0.17",
"hashloli": "git+ssh://public@flanchan.moe:hashloli.git", "hashloli": "git+ssh://git@git.flanchan.moe:flanchan/hashloli.git",
"jsoncompress": "^0.1.3", "jsoncompress": "^0.1.3",
"kana-hash": "file:../../home/avril/software/libkhash/node",
"minimist": "1.2.0", "minimist": "1.2.0",
"nan": "^2.14.0", "nan": "^2.14.0",
"recaptcha2": "^1.3.2", "recaptcha2": "^1.3.2",

10
server/server.js
Unescape View File

@ -2,7 +2,7 @@ var opts = require('./opts');
if (require.main == module) opts.parse_args(); if (require.main == module) opts.parse_args();
opts.load_defaults(); opts.load_defaults();
const khash = require("kana-hash"); //const khash = require("kana-hash");
var _ = require('../lib/underscore'), var _ = require('../lib/underscore'),
amusement = require('./amusement'), amusement = require('./amusement'),
@ -23,7 +23,7 @@ var _ = require('../lib/underscore'),
render = require('./render'), render = require('./render'),
request = require('request'), request = require('request'),
STATE = require('./state'), STATE = require('./state'),
tripcode = require('../tripcode').make(),//{hash:function(a,b){return new khash.Kana(0, this.salt).once(a);}, setSalt:function(a){if(a) this.salt = new khash.Salt(a); else this.salt = khash.Salt.Default; return this.salt;}}, //require('./../tripcode/tripcode'), //tripcode = require('../tripcode').make(),//{hash:function(a,b){return new khash.Kana(0, this.salt).once(a);}, setSalt:function(a){if(a) this.salt = new khash.Salt(a); else this.salt = khash.Salt.Default; return this.salt;}}, //require('./../tripcode/tripcode'),
urlParse = require('url').parse, urlParse = require('url').parse,
web = require('./web'), web = require('./web'),
winston = require('winston'); winston = require('winston');
@ -848,7 +848,7 @@ function allocate_post(msg, client, callback) {
post.trip = spec[parsed[1]]; post.trip = spec[parsed[1]];
} }
else if (parsed[1] || parsed[2]) { else if (parsed[1] || parsed[2]) {
var trip = tripcode.hash(parsed[1], parsed[2]); var trip = "Can this just be a string?"; //tripcode.hash(parsed[1], parsed[2]);
if (trip) if (trip)
post.trip = trip; post.trip = trip;
} }
@ -1245,8 +1245,8 @@ function non_daemon_pid_setup() {
if (require.main == module) { if (require.main == module) {
if (!process.getuid()) if (!process.getuid())
throw new Error("Refusing to run as root."); throw new Error("Refusing to run as root.");
if (!tripcode.setSalt(config.SECURE_SALT)) // if (!tripcode.setSalt(config.SECURE_SALT))
throw "Bad SECURE_SALT"; // throw "Bad SECURE_SALT";
async.series([ async.series([
imager.make_media_dirs, imager.make_media_dirs,
setup_imager_relay, setup_imager_relay,

Write Preview
Loading…
Cancel
Save