Skip to content
Snippets Groups Projects
Commit 74136913 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'task-20164-upgrade-appmonitor' into 'master'

Task 20164 upgrade appmonitor

See merge request !83
parents 5a6fae3c 98f739e3
No related branches found
No related tags found
No related merge requests found
...@@ -259,14 +259,13 @@ class appmonitorcheck { ...@@ -259,14 +259,13 @@ class appmonitorcheck {
$sDNS=isset($certinfo['extensions']['subjectAltName']) ? $certinfo['extensions']['subjectAltName'] : false; $sDNS=isset($certinfo['extensions']['subjectAltName']) ? $certinfo['extensions']['subjectAltName'] : false;
$sHost=parse_url($url,PHP_URL_HOST); $sHost=parse_url($url,PHP_URL_HOST);
if(strstr($sDNS, 'DNS:'.$sHost)===false){ if(strstr($sDNS, 'DNS:'.$sHost)===false){
$aReturn['errors'][]="Domainname $sHost ist nicht als DNS ALias im Zertifikat enthalten.";
$this->_setReturn(RESULT_ERROR, 'Wrong certificate: '.$sHost.' is not listed as DNS alias in ['.$sDNS.'] ' . $sMessage); $this->_setReturn(RESULT_ERROR, 'Wrong certificate: '.$sHost.' is not listed as DNS alias in ['.$sDNS.'] ' . $sMessage);
return true; return true;
} }
$iDaysleft = round(($certinfo['validTo_time_t'] - date('U')) / 60 / 60 / 24); $iDaysleft = round(($certinfo['validTo_time_t'] - date('U')) / 60 / 60 / 24);
$sMessage.= 'Issuer: '. $sIssuer=$certinfo['issuer']['O'] $sMessage.= 'Issuer: '. $sIssuer=$certinfo['issuer']['O']
. ' valid from: '. date("Y-m-d H:i", $certinfo['validFrom_time_t']) . '; valid from: '. date("Y-m-d H:i", $certinfo['validFrom_time_t'])
. ' to '.date("Y-m-d H:i", $certinfo['validTo_time_t']).' ' . ' to '.date("Y-m-d H:i", $certinfo['validTo_time_t']).' '
. ( $iDaysleft ? "($iDaysleft days left)" : "expired since ".(-$iDaysleft)." days.") . ( $iDaysleft ? "($iDaysleft days left)" : "expired since ".(-$iDaysleft)." days.")
; ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment