dw/DotclearWatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

use less sensible values to generate client id

Browse source
This commit is contained in:
Jean-Christian Denis 2023-07-24 17:03:19 +02:00
parent 7d558c9350
commit 153ba4038e
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Config.php
View file

@ -21,10 +21,12 @@ use Dotclear\Helper\Html\Form\{
Div, Div,
Input, Input,
Label, Label,
Li,
Note, Note,
Para, Para,
Text, Text,
Textarea Textarea,
Ul
}; };
use Dotclear\Helper\Html\Html; use Dotclear\Helper\Html\Html;
@ -93,7 +95,10 @@ class Config extends Process
echo echo
(new Div())->items([ (new Div())->items([
(new Text('p', __('Settings are globals. Reports are by blog.')))->class('message'), (new Text('p', __('Settings are globals. Reports are by blog.')))->class('message'),
(new Text('pre', sprintf(__('API %s'), Utils::DISTANT_API_VERSION))), (new Ul())->items([
(new Li())->text(sprintf(__('API: %s'), Utils::DISTANT_API_VERSION)),
(new Li())->text(sprintf(__('UID: %s'), Utils::getClient())),
]),
(new Para())->items([ (new Para())->items([
(new Label(__('Hidden modules:')))->for('hidden_modules'), (new Label(__('Hidden modules:')))->for('hidden_modules'),
(new Input('hidden_modules'))->class('maximal')->size(65)->maxlenght(255)->value(self::$hidden_modules), (new Input('hidden_modules'))->class('maximal')->size(65)->maxlenght(255)->value(self::$hidden_modules),

31
src/Utils.php
View file

@ -37,6 +37,9 @@ class Utils
/** @var array<int,string> The hiddens modules IDs */ /** @var array<int,string> The hiddens modules IDs */
private static array $hiddens = []; private static array $hiddens = [];
/** @var string Multiblog unique identifiant */
private static string $uid = '';
/** /**
* Add mark to backend menu footer. * Add mark to backend menu footer.
*/ */
@ -71,7 +74,7 @@ class Utils
/** /**
* Get plugins list. * Get plugins list.
* *
* @param bool $strict tak on ly enabled and not hidden plugins * @param bool $strict take only enabled and not hidden plugins
* *
* @return array<string,string> The plugins list. * @return array<string,string> The plugins list.
*/ */
@ -93,7 +96,7 @@ class Utils
/** /**
* Get themes list. * Get themes list.
* *
* @param bool $strict tak on ly enabled and not hidden themes * @param bool $strict take only enabled and not hidden themes
* *
* @return array<string,string> The themes list. * @return array<string,string> The themes list.
*/ */
@ -127,6 +130,14 @@ class Utils
return self::check() ? self::contents() : ''; return self::check() ? self::contents() : '';
} }
/**
* Get client uid.
*/
public static function getClient(): string
{
return self::check() ? self::uid() : '';
}
/** /**
* Clear cache directory. * Clear cache directory.
*/ */
@ -175,22 +186,30 @@ class Utils
private static function check(): bool private static function check(): bool
{ {
return defined('DC_MASTER_KEY') && defined('DC_CRYPT_ALGO') && defined('DC_TPL_CACHE') && is_dir(DC_TPL_CACHE) && is_writable(DC_TPL_CACHE); return defined('DC_CRYPT_ALGO') && defined('DC_TPL_CACHE') && is_dir(DC_TPL_CACHE) && is_writable(DC_TPL_CACHE);
} }
private static function key(): string private static function key(): string
{ {
return Crypt::hmac(DC_MASTER_KEY, My::id() . __DIR__, DC_CRYPT_ALGO); return Crypt::hmac(self::uid() . My::id(), DC_CRYPT_ALGO);
} }
private static function uid(): string private static function uid(): string
{ {
return md5(DC_MASTER_KEY . My::id()); if (empty(self::$uid)) {
self::$uid = (string) My::settings()->getGlobal('client_uid');
if (empty(self::$uid) || strlen(self::$uid) != 32) {
self::$uid = md5(uniqid() . My::id() . time());
My::settings()->put('client_uid', self::$uid, 'string', 'Client UID', false, true);
}
}
return self::$uid;
} }
private static function buid(): string private static function buid(): string
{ {
return md5(DC_MASTER_KEY . My::id() . dcCore::app()->blog->uid); return md5(self::uid() . dcCore::app()->blog->uid);
} }
private static function url() private static function url()