random_string calls

implement getRandomHex function

diff --git a/include/api.php b/include/api.php
index 0f7fa85bdde551dcdb0c2a4ccdfb19e3b254d3fc..10ee292871f9cf0ca8b5db84b3cbd8ad0635ce76 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -43,6 +43,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'include/conversation.php';
@@ -4802,7 +4803,7 @@ function api_friendica_remoteauth()
                $dfrn_id = '0:' . $orig_id;
        }
 
-       $sec = random_string();
+       $sec = Strings::getRandomHex();
 
        $fields = ['uid' => api_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
                'sec' => $sec, 'expire' => time() + 45];

diff --git a/include/enotify.php b/include/enotify.php
index d6ca12327179404e772c743089012adbf5c54cdf..2033027e3d1ca54eefe47d9f04b1ab72fbc021b8 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -15,6 +15,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
+use Friendica\Util\Strings;
 
 /**
  * @brief Creates a notification entry and possibly sends a mail
@@ -457,7 +458,7 @@ function notification($params)
                Logger::log("adding notification entry", Logger::DEBUG);
                do {
                        $dups = false;
-                       $hash = random_string();
+                       $hash = Strings::getRandomHex();
                        if (DBA::exists('notify', ['hash' => $hash])) {
                                $dups = true;
                        }

diff --git a/include/items.php b/include/items.php
index 9929f535f02a7ea0a2c0a81f69e058b2c239ee91..adc5bf0133d2570afc71bae4246e394638788841 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -21,6 +21,7 @@ use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
+use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
 require_once 'include/text.php';
@@ -308,7 +309,7 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub
        $push_url = System::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id'];
 
        // Use a single verify token, even if multiple hubs
-       $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());
+       $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : Strings::getRandomHex());
 
        $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token;
 

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 0f001b11a294e9069f562368b458d11976488b5d..8d4594c152cae6fbe8eb3887e84ec6c0aa1d644a 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -33,6 +33,7 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'include/enotify.php';
@@ -263,7 +264,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                        break;
                                case 1:
                                        // birthday paradox - generate new dfrn-id and fall through.
-                                       $new_dfrn_id = random_string();
+                                       $new_dfrn_id = Strings::getRandomHex();
                                        q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
                                                DBA::escape($new_dfrn_id),
                                                intval($contact_id),

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index b14c71fb862c27d3315531ef5c53c3a719b57377..ba2332bcb184cd934b1390b9a2f555326511c6e2 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -14,6 +14,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\Strings;
 
 require_once 'include/items.php';
 
@@ -267,7 +268,7 @@ function dfrn_notify_content(App $a) {
                        $dfrn_id = substr($dfrn_id,2);
                }
 
-               $hash = random_string();
+               $hash = Strings::getRandomHex();
 
                $status = 0;
 

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index a961506d17bdba1282d2ece568c7a0e14c7b6735..9cd110917fb5161dfccbd57dd347b8836e862e27 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -14,6 +14,7 @@ use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'include/items.php';
@@ -415,7 +416,7 @@ function dfrn_poll_content(App $a)
 
        if ($dfrn_id != '') {
                // initial communication from external contact
-               $hash = random_string();
+               $hash = Strings::getRandomHex();
 
                $status = 0;
 

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index fdb1a42ee292ac1810ba2b215b0ac7b91b86d86c..e5d5a3fe221c87c4e732d667f4e2c842d8f657d3 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -28,6 +28,7 @@ use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 require_once 'include/enotify.php';
 
@@ -320,7 +321,7 @@ function dfrn_request_post(App $a)
                                }
                        }
 
-                       $issued_id = random_string();
+                       $issued_id = Strings::getRandomHex();
 
                        if (is_array($contact_record)) {
                                // There is a contact record but no issued-id, so this
@@ -415,7 +416,7 @@ function dfrn_request_post(App $a)
                                return;
                        }
 
-                       $hash = random_string() . (string) time();   // Generate a confirm_key
+                       $hash = Strings::getRandomHex() . (string) time();   // Generate a confirm_key
 
                        if (is_array($contact_record)) {
                                $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 35710bb338d0139717ed133228d3bcaf3bd53222..f87046f6c9d9b667eccaa023d9bdff17774fda7a 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -9,6 +9,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 function fsuggest_post(App $a)
 {
@@ -34,7 +35,7 @@ function fsuggest_post(App $a)
 
        $new_contact = intval($_POST['suggest']);
 
-       $hash = random_string();
+       $hash = Strings::getRandomHex();
 
        $note = escape_tags(trim(defaults($_POST, 'note', '')));
 

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index ea27f048223af99477dbee5cf51b3306997ed84a..26a157e2fd110dba1ede311b2de098ae933a5ddd 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -93,7 +93,7 @@ function pubsubhubbub_init(App $a) {
                }
 
                // do subscriber verification according to the PuSH protocol
-               $hub_challenge = random_string(40);
+               $hub_challenge = Strings::getRandomHex(40);
                $params = 'hub.mode=' .
                        ($subscribe == 1 ? 'subscribe' : 'unsubscribe') .
                        '&hub.topic=' . urlencode($hub_topic) .

diff --git a/mod/redir.php b/mod/redir.php
index 088a5f55e30754ddf34d4c273dd4b5a00b4b956c..6077a26f9a2925041edb20572dd54f969d664ac7 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -8,6 +8,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
@@ -93,7 +94,7 @@ function redir_init(App $a) {
                                $dfrn_id = '0:' . $orig_id;
                        }
 
-                       $sec = random_string();
+                       $sec = Strings::getRandomHex();
 
                        $fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
                                'sec' => $sec, 'expire' => time() + 45];

diff --git a/mod/removeme.php b/mod/removeme.php
index c2ceb7d4cf6d10aee8c66959c223f03fb44a0af7..44671ef073abae8abb27ddfae953c352b367c01b 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -68,7 +68,7 @@ function removeme_content(App $a)
                $a->internalRedirect();
        }
 
-       $hash = random_string();
+       $hash = Strings::getRandomHex();
 
        require_once("mod/settings.php");
        settings_init($a);

diff --git a/spec/dfrn2_contact_request.svg b/spec/dfrn2_contact_request.svg
index cc78be55c8fa34e93c8f0a130f981fc7c8b77d74..34de340f33c3aabc7f59c341fda955f90e5a4408 100644 (file)
--- a/spec/dfrn2_contact_request.svg
+++ b/spec/dfrn2_contact_request.svg
@@ -38,7 +38,7 @@ text { font:12px Dialog; }
 <text x="904" y="1084" style="font:13px Open Sans">where self = 0 to look if this contact is already there (if </text>
 <text x="904" y="1107" style="font:13px Open Sans">issued-id or rel is already available return here because it </text>
 <text x="904" y="1130" style="font:13px Open Sans">seems that we are already connected)</text>
-<text x="904" y="1176" style="font:13px Open Sans">- create a issued-id with $issued_id = random_string();</text>
+<text x="904" y="1176" style="font:13px Open Sans">- create a issued-id with $issued_id = Strings::getRandomHex();</text>
 <text x="904" y="1222" style="font:13px Open Sans">- if we already found a contact record above update the </text>
 <text x="904" y="1245" style="font:13px Open Sans">issued-id with the one we have created</text>
 <text x="904" y="1291" style="font:13px Open Sans">- otherwise if Bob is not already in the contact table scrape </text>

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index cdfd41c11f526e754310c9e5f3a951ef7b5c5118..9b73da56df2e4dc2f2a03817aca5b944cc8fe915 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -7,6 +7,7 @@ namespace Friendica\Content\Text;
 
 use DOMDocument;
 use DOMXPath;
+use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\Config;
@@ -17,9 +18,9 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use League\HTMLToMarkdown\HtmlConverter;
-use Friendica\Content\Feature;
 
 class HTML
 {
@@ -1011,7 +1012,7 @@ class HTML
                        $tpl = Renderer::getMarkupTemplate('wall/content_filter.tpl');
                        $html = Renderer::replaceMacros($tpl, [
                                '$reasons'   => $reasons,
-                               '$rnd'       => random_string(8),
+                               '$rnd'       => Strings::getRandomHex(8),
                                '$openclose' => L10n::t('Click to open/close'),
                                '$html'      => $html
                        ]);

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 5d571e30e1e8d7271e2a2587767cedd8923d5f58..1a6349d9ca463e1d0557f0e463e67b3a2dd13663 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -25,6 +25,7 @@ use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -1889,7 +1890,7 @@ class Contact extends BaseObject
                        $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
                        if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
                                // create notification
-                               $hash = random_string();
+                               $hash = Strings::getRandomHex();
 
                                if (is_array($contact_record)) {
                                        DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 1eb96609f2ace041f2f9ade9af459bc340753fad..35dfb7264c92b11fb54aa4cea1e7afc587958d72 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -33,6 +33,7 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\XML;
 use Friendica\Util\Security;
+use Friendica\Util\Strings;
 use Text_LanguageDetect;
 
 require_once 'boot.php';
@@ -3479,7 +3480,7 @@ class Item extends BaseObject
 
                while ((strpos($s, $spoilersearch) !== false)) {
                        $pos = strpos($s, $spoilersearch);
-                       $rnd = random_string(8);
+                       $rnd = Strings::getRandomHex(8);
                        $spoilerreplace = '<br /> <span id="spoiler-wrap-' . $rnd . '" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-' . $rnd . '\');">' . L10n::t('Click to open/close') . '</span>'.
                                                '<blockquote class="spoiler" id="spoiler-' . $rnd . '" style="display: none;">';
                        $s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch));
@@ -3490,7 +3491,7 @@ class Item extends BaseObject
 
                while ((strpos($s, $authorsearch) !== false)) {
                        $pos = strpos($s, $authorsearch);
-                       $rnd = random_string(8);
+                       $rnd = Strings::getRandomHex(8);
                        $authorreplace = '<br /> <span id="author-wrap-' . $rnd . '" class="author-wrap fakelink" onclick="openClose(\'author-' . $rnd . '\');">' . L10n::t('Click to open/close') . '</span>'.
                                                '<blockquote class="author" id="author-' . $rnd . '" style="display: block;">';
                        $s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch));

diff --git a/src/Model/Register.php b/src/Model/Register.php
index e54db87a6b7fee15643a02e62fe4f4fe052566d0..5311c80c268ad7404e9b4d256dab443db1a380c6 100644 (file)
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -7,6 +7,7 @@ namespace Friendica\Model;
 
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 /**
  * Class interacting with the register database table
@@ -100,7 +101,7 @@ class Register
         */
        public static function createForApproval($uid, $language, $note = '')
        {
-               $hash = random_string();
+               $hash = Strings::getRandomHex();
 
                if (!User::exists($uid)) {
                        return false;

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index b8af1f96147766c2bf4f785a81eab45ed55ab704..01c5d5d464abf90ba0035a17b2a4f1da92ad8d1f 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 /**
  * Magic Auth (remote authentication) module.
@@ -74,7 +75,7 @@ class Magic extends BaseModule
 
                                $headers = [];
                                $headers['Accept'] = 'application/x-dfrn+json';
-                               $headers['X-Open-Web-Auth'] = random_string();
+                               $headers['X-Open-Web-Auth'] = Strings::getRandomHex();
 
                                // Create a header that is signed with the local users private key.
                                $headers = HTTPSignature::createSig(

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index a1dbfa2f315ea3aa8b31d9f2f12e5ae99854f5b9..8832dd9b0d12d6db823520fad86868be6682c272 100644 (file)
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\OpenWebAuthToken;
 use Friendica\Util\HTTPSignature;
+use Friendica\Util\Strings;
 
 /**
  * @brief OpenWebAuth verifier and token generator
@@ -62,7 +63,7 @@ class Owa extends BaseModule
                                                                Logger::log('OWA success: ' . $contact['addr'], Logger::DATA);
 
                                                                $ret['success'] = true;
-                                                               $token = random_string(32);
+                                                               $token = Strings::getRandomHex(32);
 
                                                                // Store the generated token in the databe.
                                                                OpenWebAuthToken::create('owt', 0, $token, $contact['addr']);

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index fc93524bfd79222129f8e3473fb3db0ff4a0f5c1..a9a7a93ab900161392a8c3e0d8c0d743b846cbde 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -24,6 +24,7 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use DomXPath;
 
@@ -1648,8 +1649,8 @@ class Probe
                $data["nick"]    = $data["name"];
                $data["photo"]   = Network::lookupAvatarByEmail($uri);
                $data["url"]     = 'mailto:'.$uri;
-               $data["notify"]  = 'smtp '.random_string();
-               $data["poll"]    = 'email '.random_string();
+               $data["notify"]  = 'smtp ' . Strings::getRandomHex();
+               $data["poll"]    = 'email ' . Strings::getRandomHex();
 
                $x = Email::messageMeta($mbox, $msgs[0]);
                if (stristr($x[0]->from, $uri)) {

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 8a2b21745d00a1abb217bf8486ed0f9a73f36f16..c9ad69cc10a250bbdd4722241fdf0cf636a3d577 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -33,6 +33,7 @@ use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use HTMLPurifier;
 use HTMLPurifier_Config;
@@ -2009,7 +2010,7 @@ class DFRN
 
                $fid = $r[0]["id"];
 
-               $hash = random_string();
+               $hash = Strings::getRandomHex();
 
                $r = q(
                        "INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
@@ -3030,7 +3031,7 @@ class DFRN
                                return;
                        }
 
-                       $sec = random_string();
+                       $sec = Strings::getRandomHex();
 
                        DBA::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]);
 

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 0b5c9c9496783c898c5a380ec8a04e3093ff7d12..8fc17f97d1c13f879235e24d2d00e9c504344bb0 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -34,6 +34,7 @@ use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use SimpleXMLElement;
 
@@ -2421,7 +2422,7 @@ class Diaspora
                if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) {
                        Logger::log("Sending intra message for author ".$author.".", Logger::DEBUG);
 
-                       $hash = random_string().(string)time();   // Generate a confirm_key
+                       $hash = Strings::getRandomHex().(string)time();   // Generate a confirm_key
 
                        $ret = q(
                                "INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
@@ -3055,7 +3056,7 @@ class Diaspora
                        return 200;
                }
 
-               $logid = random_string(4);
+               $logid = String::getRandomHex(4);
 
                $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
 

diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php
index e53590cf312cc2da5852bfe1bb473415ba3d6261..c9fde441fdcfcbcb4e80bdafff36b02cd163cca3 100644 (file)
--- a/src/Util/LDSignature.php
+++ b/src/Util/LDSignature.php
@@ -54,7 +54,7 @@ class LDSignature
        {
                $options = [
                        'type' => 'RsaSignature2017',
-                       'nonce' => random_string(64),
+                       'nonce' => Strings::getRandomHex(64),
                        'creator' => $owner['url'] . '#main-key',
                        'created' => DateTimeFormat::utcNow(DateTimeFormat::ATOM)
                ];

diff --git a/src/Util/Strings.php b/src/Util/Strings.php
index 8df9f585d1ce7dd885a9e38c57ac5ab329971819..ceb1a946a1702406b85ea7673e93a709976f5544 100644 (file)
--- a/src/Util/Strings.php
+++ b/src/Util/Strings.php
@@ -16,7 +16,7 @@ class Strings
      * @param int $size
      * @return string
      */
-    public static function getRandomHex($size = 64) // random_string()
+    public static function getRandomHex($size = 64)
     {
         $byte_size = ceil($size / 2);