mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-06 01:29:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: ReplaceKey to not reference server state and improve timing check

Browse Source
This commit is contained in:
Zack Spear
2024-02-05 11:19:05 -08:00
committed by Zack Spear
parent 7ca74f9862
commit d27a796160
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
emhttp/plugins/dynamix/include/ReplaceKey.php
View File

@@ -1,14 +1,13 @@
<?php
$webguiGlobals = $GLOBALS;
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
class ReplaceKey
{
private const KEY_SERVER_URL = 'https://keys.lime-technology.com';
private $docroot;
private $serverState;
private $var;
private $guid;
private $keyfile;
private $regExp;
@@ -17,12 +16,16 @@ class ReplaceKey
{
$this->docroot = $GLOBALS['docroot'] ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
$ServerStateClass = new ServerState();
$this->serverState = $ServerStateClass->getServerState();
$this->var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
$this->guid = @$this->var['regGUID'] ?? null;
$this->guid = @$this->serverState['guid'] ?? null;
$this->keyfile = @$this->serverState['keyfile'] ?? null;
$this->regExp = @$this->serverState['regExp'] ?? null;
$keyfileBase64 = empty($this->var['regFILE']) ? null : @file_get_contents($this->var['regFILE']);
if ($keyfileBase64 !== false) {
$keyfileBase64 = @base64_encode($keyfileBase64);
$this->keyfile = str_replace(['+', '/', '='], ['-', '_', ''], trim($keyfileBase64));
}
$this->regExp = @$this->var['regExp'] ?? null;
}
private function request($url, $method, $payload = null, $headers = null)
@@ -155,12 +158,16 @@ class ReplaceKey
public function check()
{
// we don't need to check
if ($this->guid === null || $this->keyfile === null || $this->regExp === null) {
if (empty($this->guid) || empty($this->keyfile) || empty($this->regExp)) {
return;
}
// set $isAlreadyExpired to true if regExp is in the past
$isAlreadyExpired = $this->regExp <= time();
// if regExp is seven days or less from now, we need to check
$shouldCheck = strtotime($this->regExp) <= strtotime('+7 days');
$isWithinSevenDays = $this->regExp <= strtotime('+7 days');
$shouldCheck = $isAlreadyExpired || $isWithinSevenDays;
if (!$shouldCheck) {
return;
}