make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
old mode 100644 (file)
new mode 100755 (executable)
index f1cef0a..3d525f5
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,21 +1,7 @@
 <?php
 
-require_once('library/asn1.php');
+require_once('include/crypto.php');
 
-function salmon_key($pubkey) {
-       $lines = explode("\n",$pubkey);
-       unset($lines[0]);
-       unset($lines[count($lines)]);
-       $x = base64_decode(implode('',$lines));
-
-       $r = ASN_BASE::parseASNString($x);
-
-       $m = $r[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
-       $e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
-
-
-       return 'RSA' . '.' . $m . '.' . $e ;
-}
 
 
 function get_salmon_key($uri,$keyhash) {
@@ -87,6 +73,13 @@ function slapper($owner,$url,$slap) {
        if(! strlen($url))
                return;
 
+
+       if(! $owner['sprvkey']) {
+               logger(sprintf("slapper: user '%s' (%d) does not have a salmon private key. Send failed.",
+               $owner['username'],$owner['uid']));
+               return;
+       }
+
        // add all namespaces to item
 
 $namespaces = <<< EOT
@@ -112,26 +105,15 @@ EOT;
        $algorithm = 'RSA-SHA256';
        $keyhash   = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true);
 
-       // Setup RSA stuff to PKCS#1 sign the data
-
-       set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
-
-       require_once('library/phpsec/Crypt/RSA.php');
-
-    $rsa = new CRYPT_RSA();
-    $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
-    $rsa->setHash('sha256');
-       $rsa->loadKey($owner['sprvkey']);
-
        // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
 
        $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
 
-       $signature   = base64url_encode($rsa->sign(str_replace('=','',$data . $precomputed),true));
+       $signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
 
-       $signature2  = base64url_encode($rsa->sign($data . $precomputed));
+       $signature2  = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
 
-       $signature3  = base64url_encode($rsa->sign($data));
+       $signature3  = base64url_encode(rsa_sign($data,$owner['sprvkey']));
 
        $salmon_tpl = get_markup_template('magicsig.tpl');
 
@@ -205,6 +187,9 @@ EOT;
        logger('slapper returned ' . $return_code); 
        if(! $return_code)
                return(-1);
+       if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
+               return(-1);
+
        return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }