keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added 's' keys - salmon keys, small keys, stupid keys, whatever...

Browse source
This commit is contained in:
Mike Macgirvin 2010-10-11 23:22:38 -07:00
parent 6b67d00fce
commit b9d768972e
5 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -2,7 +2,7 @@
set_time_limit(0); set_time_limit(0);
define ( 'BUILD_ID' , 1005 ); define ( 'BUILD_ID' , 1006 );
define ( 'EOL', "<br />\r\n"); define ( 'EOL', "<br />\r\n");
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

18
database.sql
View file

@ -349,16 +349,14 @@ CREATE TABLE IF NOT EXISTS `user` (
`theme` char(255) NOT NULL, `theme` char(255) NOT NULL,
`pubkey` text NOT NULL, `pubkey` text NOT NULL,
`prvkey` text NOT NULL, `prvkey` text NOT NULL,
`verified` tinyint(1) unsigned NOT NULL DEFAULT '0', `spubkey` text NOT NULL,
`blocked` tinyint(1) unsigned NOT NULL DEFAULT '0', `sprvkey` text NOT NULL,
`notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', `verified` tinyint(1) unsigned NOT NULL DEFAULT '0', `blocked`
`pwdreset` char(255) NOT NULL, tinyint(1) unsigned NOT NULL DEFAULT '0', `notify-flags` int(11)
`allow_cid` mediumtext NOT NULL, unsigned NOT NULL DEFAULT '65535', `pwdreset` char(255) NOT NULL,
`allow_gid` mediumtext NOT NULL, `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, `deny_gid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL, PRIMARY KEY (`uid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
PRIMARY KEY (`uid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `register` ( CREATE TABLE IF NOT EXISTS `register` (

4
mod/dfrn_confirm.php
View file

@ -290,7 +290,7 @@ function dfrn_confirm_post(&$a) {
$source_url = hex2bin($_POST['source_url']); $source_url = hex2bin($_POST['source_url']);
$aes_key = $_POST['aes_key']; $aes_key = $_POST['aes_key'];
$duplex = $_POST['duplex']; $duplex = $_POST['duplex'];
$version_id = $_POST['dfrn_version']; $version_id = (float) $_POST['dfrn_version'];
// If $aes_key is set, both of these items require unpacking from the hex transport encoding. // If $aes_key is set, both of these items require unpacking from the hex transport encoding.
@ -483,7 +483,7 @@ function dfrn_confirm_post(&$a) {
$res = mail($r[0]['email'], t("Connection accepted at ") . $a->config['sitename'], $res = mail($r[0]['email'], t("Connection accepted at ") . $a->config['sitename'],
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] ); $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
if(!$res) { if(!$res) {
notice( t("Email notification failed.") . EOL ); // pointless throwing an error here and confusing the person at the other end of the wire.
} }
} }
xml_status(0); // Success xml_status(0); // Success

20
mod/register.php
View file

@ -109,15 +109,31 @@ function register_post(&$a) {
$pkey = openssl_pkey_get_details($res); $pkey = openssl_pkey_get_details($res);
$pubkey = $pkey["key"]; $pubkey = $pkey["key"];
$sres=openssl_pkey_new(array(
'encrypt_key' => false ));
// Get private key
$sprvkey = '';
openssl_pkey_export($sres, $sprvkey);
// Get public key
$spkey = openssl_pkey_get_details($sres);
$spubkey = $spkey["key"];
$r = q("INSERT INTO `user` ( `username`, `password`, `email`, `nickname`, $r = q("INSERT INTO `user` ( `username`, `password`, `email`, `nickname`,
`pubkey`, `prvkey`, `verified`, `blocked` ) `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `verified`, `blocked` )
VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )", VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
dbesc($username), dbesc($username),
dbesc($new_password_encoded), dbesc($new_password_encoded),
dbesc($email), dbesc($email),
dbesc($nickname), dbesc($nickname),
dbesc($pubkey), dbesc($pubkey),
dbesc($prvkey), dbesc($prvkey),
dbesc($spubkey),
dbesc($sprvkey),
intval($verified), intval($verified),
intval($blocked) intval($blocked)
); );

7
update.php
View file

@ -34,3 +34,10 @@ function update_1003() {
function update_1004() { function update_1004() {
q("ALTER TABLE `contact` ADD `subhub` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `usehub`"); q("ALTER TABLE `contact` ADD `subhub` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `usehub`");
} }
function update_1005() {
q("ALTER TABLE `user` ADD `spubkey` TEXT NOT NULL AFTER `prvkey` ,
ADD `sprvkey` TEXT NOT NULL AFTER `spubkey`");
}