Cryptographic privates suppot #277
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,303 @@ | ||
| 'use strict'; | ||
| var openpgp = require('openpgp'); | ||
| var pg = require('pg'); | ||
| var https = require('https'); | ||
| var url = require('url'); | ||
| var authSRV = 'https://nanopeppa.freefeed.net/v1/posts/'; | ||
| var pgsqlOptions= require('../../../../config/config').load().secret_pg; | ||
| exports.addController = function(app) { | ||
| var SecretController = function() { | ||
| } | ||
| SecretController.sendPosts = function(req,res){ | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| var urlReq = url.parse(req.url); | ||
| if(urlReq.query.id) | ||
| client.query( | ||
| 'select * from "posts" where "id" = $1;' | ||
| ,[urlReq.query.id] | ||
| ,function (sqlerr,sqlres){ | ||
| porcessUnauthQuery(res, sqlerr,sqlres,done); | ||
| } | ||
| ); | ||
| else{ | ||
| var offset = 0; | ||
| var limit = 10; | ||
| if(typeof urlReq.query.offset === 'number')offset = urlReq.query.offset; | ||
| if(typeof urlReq.query.limit === 'number') | ||
| limit = urlReq.query.limit<100?urlReq.query.limit:100; | ||
| client.query( | ||
| 'select * from "posts" order by "createdAt" desc limit $1 offset $2 ;' | ||
| ,[limit, offset] | ||
| ,function (sqlerr,sqlres){ | ||
| porcessUnauthQuery(res, sqlerr,sqlres,done); | ||
| } | ||
| ); | ||
| } | ||
| }); | ||
|
|
||
| } | ||
| SecretController.sendCmts = function(req,res){ | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| var offset = 0; | ||
| var limit = 30; | ||
| var urlReq = url.parse(req.url); | ||
| if(typeof urlReq.query.offset === 'number')offset = urlReq.query.offset; | ||
| if(typeof urlReq.query.limit === 'number') | ||
| limit = urlReq.query.limit<1000?urlReq.query.limit:1000; | ||
|
|
||
| client.query( | ||
| 'select * from "comments" order by "createdAt" desc limit $1 offset $2 ;' | ||
| ,[limit, offset] | ||
| ,function (sqlerr,sqlres){ | ||
| porcessUnauthQuery(res, sqlerr,sqlres,done); | ||
| } | ||
| ); | ||
|
|
||
| }); | ||
|
|
||
| } | ||
| function porcessUnauthQuery (res, sqlerr,sqlres,done){ | ||
| if (sqlerr) res.writeHead(500); | ||
| else if(!sqlres.rowCount) | ||
| res.writeHead(404); | ||
| else if(typeof sqlres.rows[0] === 'undefined') | ||
| res.writeHead(500); | ||
| else{ | ||
| res.writeHead(200, { 'Content-Type': 'text/json' }); | ||
| res.write(JSON.stringify({'posts':sqlres.rows})); | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }; | ||
| SecretController.sendUserPub = function(req,res){ | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('select "pub_key" from "keys" where "Username" = $1;' | ||
| ,[req.params.username] | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) res.writeHead(500); | ||
| else if(!sqlres.rowCount) | ||
| res.writeHead(404); | ||
| else if(typeof sqlres.rows[0] === 'undefined') | ||
| res.writeHead(500); | ||
| else{ | ||
| res.writeHead(200, { 'Content-Type': 'text/plain' }); | ||
| res.write(sqlres.rows[0].pub_key); | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| SecretController.register = function(req,res){ | ||
| if (!req.user) | ||
| return res.status(400).jsonp({ err: 'Not found' }); | ||
| var key = openpgp.key.readArmored(req.body.d).keys[0]; | ||
| var write_token = new Buffer(openpgp.crypto.random.getRandomBytes(16)).toString('base64'); | ||
| var values = [req.user.username_, req.body.d, '', write_token ] ; | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('INSERT INTO "keys" ' | ||
| +'("Username","pub_key", "secret_data", "write_token")' | ||
| +'VALUES ($1, $2, $3, $4) ;', values | ||
| ,function (sqlerr,sqlres){ | ||
| sendEnc(res, key, write_token ); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| SecretController.sendToken = function(req,res){ | ||
| var username = req.headers['x-authentication-user']; | ||
| var write_token = new Buffer(openpgp.crypto.random.getRandomBytes(16)).toString('base64'); | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('update "keys" set "write_token"= $1 where "Username" = $2 ;' | ||
| ,[write_token,username] | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) res.writeHead(500); | ||
| else if(typeof sqlres === 'undefined'){ | ||
| res.writeHead(400); | ||
| }else { | ||
| client.query('select "pub_key" from "keys" where "Username" = $1;' | ||
| ,[username] | ||
| ,function (sqlerr,sqlres){ | ||
| done(); | ||
| if (sqlerr) res.writeHead(500); | ||
| else if(!sqlres.rowCount) | ||
| res.writeHead(404); | ||
| else if(typeof sqlres.rows[0] === 'undefined') | ||
| res.writeHead(500); | ||
| else{ | ||
| var key = openpgp.key.readArmored(sqlres.rows[0].pub_key).keys[0]; | ||
| return sendEnc(res, key,write_token); | ||
| } | ||
| res.end(); | ||
| }); | ||
| return; | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
| } | ||
| function sendEnc (res, key, data ){ | ||
| res.writeHead(200, { 'Content-Type': 'text/plain' }); | ||
| openpgp.encryptMessage(key,data).then( function (a){res.write(a); res.end();}); | ||
| }; | ||
|
|
||
| SecretController.update = function(req,res){ | ||
| var username = req.headers['x-authentication-user']; | ||
| var token = req.headers['x-authentication-token']; | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| var params = [req.body.d, username, token]; | ||
| client.query('update "keys" set "secret_data" = $1 where "Username" = $2 and "write_token" = $3 returning "secret_data";' | ||
| //we can make a 3-way auth by sending salt to the client and comparing hashes | ||
| ,params | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) res.writeHead(500); | ||
| else if(typeof sqlres === 'undefined') res.writeHead(400); | ||
| else if (sqlres.rowCount == 0 )res.writeHead(400); | ||
| else res.writeHead(204); | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| SecretController.post = function(req,res){ | ||
| var type = req.headers['x-content-type']; | ||
| var token = req.headers['x-content-token']; | ||
| if (type == 'comment')type = 'comments'; | ||
| else if (type == 'post')type = 'posts'; | ||
| else { | ||
| res.writeHead(400); | ||
| res.end(); | ||
| } | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('insert into '+ type +' ("createdAt", "body", "token" ) values (current_timestamp, $1, $2)' | ||
| +'RETURNING "id", "createdAt", "body";' | ||
| //we can make a 3-way auth by sending salt to the client and comparing hashes | ||
| , [req.body.d, token] | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) { | ||
| res.writeHead(500); | ||
| console.log(sqlerr); | ||
| } | ||
| else if(!sqlres.rowCount) | ||
| res.writeHead(404); | ||
| else if(typeof sqlres.rows[0] === 'undefined') | ||
| res.writeHead(500); | ||
| else{ | ||
| res.writeHead(200, { 'Content-Type': 'text/json' }); | ||
| res.write(JSON.stringify({'posts':sqlres.rows[0]})); | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
| } | ||
| SecretController.deleteP = function(req,res){ | ||
| var username = req.headers['x-authentication-user']; | ||
| var token = req.headers['x-access-token']; | ||
| var postid = req.headers['x-content-id']; | ||
| var type= req.headers['x-content-type']; | ||
| if (type == 'comment')type = 'comments'; | ||
| else if (type == 'post')type = 'posts'; | ||
| else { | ||
| res.writeHead(400); | ||
| res.end('wrong type'); | ||
| return; | ||
| } | ||
| if(!token || !postid){ | ||
| res.writeHead(400); | ||
| res.end('parameters missing'); | ||
| return; | ||
| } | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('DELETE from '+type+' where "id" = $1 and "token" = $2;' | ||
| //we can make a 3-way auth by sending salt to the client and comparing hashes | ||
| , [postid,token] | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) { | ||
| res.writeHead(500); | ||
| console.log(sqlerr); | ||
| } else if(typeof sqlres === 'undefined') res.writeHead(400); | ||
| else if (!sqlres.rowCount) res.writeHead(400); | ||
| else{ | ||
| res.writeHead(204); | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| SecretController.editP = function(req,res){ | ||
| var type= req.headers['x-content-type']; | ||
| var token = req.headers['x-access-token']; | ||
| var newToken = req.headers['x-content-token']; | ||
| var id = req.headers['x-content-id']; | ||
| if (type == 'comment')type = 'comments'; | ||
| else if (type == 'post')type = 'posts'; | ||
| else { | ||
| res.writeHead(400); | ||
| res.end('wrong type'); | ||
| return; | ||
| } | ||
| if(!token || !newToken || !id){ | ||
| res.writeHead(400); | ||
| res.end('parameters missing'); | ||
| return; | ||
| } | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('UPDATE '+type+' set "body" = $1, "token" = $2 where "id" = $3 and "token" = $4 ' | ||
| +'RETURNING "id", "createdAt", "body";' | ||
| //we can make a 3-way auth by sending salt to the client and comparing hashes | ||
| , [ req.body.d, newToken, id, token ] | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) { | ||
| res.writeHead(500); | ||
| console.log(sqlerr); | ||
| } else if(typeof sqlres === 'undefined') res.writeHead(400); | ||
| else if (!sqlres.rowCount) res.writeHead(404); | ||
| else{ | ||
| res.writeHead(200); | ||
| res.write(JSON.stringify({'posts':sqlres.rows[0]})); | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
| } | ||
| SecretController.sendUserPriv = function(req,res){ | ||
| var username = req.headers['x-authentication-user']; | ||
| pg.connect(pgsqlOptions, function(err, client, done){ | ||
| if(err) return console.log(err); | ||
| client.query('SELECT "secret_data" FROM "keys" WHERE "Username" = $1;',[username] | ||
| ,function (sqlerr,sqlres){ | ||
| if (sqlerr) res.writeHead(500); | ||
| else if(!sqlres.rowCount) | ||
| res.writeHead(404); | ||
| else if(typeof sqlres.rows[0] === 'undefined') | ||
| res.writeHead(500); | ||
| else{ | ||
| res.writeHead(200, { 'Content-Type': 'text/plain' }); | ||
| res.write(sqlres.rows[0].secret_data); | ||
| } | ||
| res.end(); | ||
| done(); | ||
| }); | ||
| }); | ||
| } | ||
| return SecretController; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| 'use strict'; | ||
| var SecretController = require('../../../controllers').SecretController; | ||
|
|
||
| exports.addRoutes = function(app) { | ||
| app.get('/secret/posts', SecretController.sendPosts); | ||
| app.get('/secret/cmts', SecretController.sendCmts); | ||
| app.get('/secret/user/:username', SecretController.sendUserPub); | ||
| app.get('/secret/token', SecretController.sendToken); | ||
| app.get('/secret/data', SecretController.sendUserPriv); | ||
| app.post('/secret/register', SecretController.register); | ||
| app.post('/secret/update', SecretController.update); | ||
| app.post('/secret/post', SecretController.post); | ||
| app.put('/secret/edit', SecretController.editP); | ||
| app.delete('/secret/delete', SecretController.deleteP); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,9 @@ exports.getConfig = function() { | |
| database: 2, | ||
|
|
||
| secret: 'secret', | ||
|
|
||
| origin: '*', | ||
|
There was a problem hiding this comment. that's my stuff for testing, sorry On Thu, Jul 30, 2015 at 5:58 PM, epicmonkey [email protected]
|
||
|
|
||
| appRoot: '.', | ||
| acceptHashedPasswordsOnly: false, | ||
|
|
||
|
|
@@ -48,7 +50,6 @@ exports.getConfig = function() { | |
| 'friends', 'list', 'search', 'summary', 'share','404', | ||
| 'iphone', 'attachments', 'files', 'profilepics', 'requests'] | ||
| } | ||
| config.media = { | ||
| // Public URL prefix | ||
| url: config.host + '/', // must have trailing slash | ||
|
|
@@ -107,5 +108,12 @@ exports.getConfig = function() { | |
| } | ||
| } | ||
|
|
||
| config.secret_pg = { | ||
| user : 'frf_secret', | ||
| database : 'frf_secret', | ||
| ssl : false, //consider making it true for a remote server | ||
| host : 'localhost', | ||
| server_port : 3030 | ||
| } | ||
| return config | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this line is not needed anymore? just as
httpsrequireThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup, that's true
On Thu, Jul 30, 2015 at 5:56 PM, Alexey Zakhlestin <[email protected]