@ -245,12 +245,12 @@ class Monitor extends BeanModel {
/ * *
/ * *
* Encode user and password to Base64 encoding
* Encode user and password to Base64 encoding
* for HTTP "basic" auth , as per RFC - 7617
* for HTTP "basic" auth , as per RFC - 7617
* @ param { string } user Username to encode
* @ param { string | null } user - The username ( nullable if not changed by a user )
* @ param { string } pass Password to encode
* @ param { string | null } pass - The password ( nullable if not changed by a user )
* @ returns { string } Encoded username : password
* @ returns { string }
* /
* /
encodeBase64 ( user , pass ) {
encodeBase64 ( user , pass ) {
return Buffer . from ( user + ":" + pass ) . toString ( "base64" ) ;
return Buffer . from ( ` ${ user || "" } : ${ pass || "" } ` ) . toString ( "base64" ) ;
}
}
/ * *
/ * *
@ -533,6 +533,18 @@ class Monitor extends BeanModel {
}
}
}
}
let tlsInfo = { } ;
// Store tlsInfo when secureConnect event is emitted
// The keylog event listener is a workaround to access the tlsSocket
options . httpsAgent . once ( "keylog" , async ( line , tlsSocket ) => {
tlsSocket . once ( "secureConnect" , async ( ) => {
tlsInfo = checkCertificate ( tlsSocket ) ;
tlsInfo . valid = tlsSocket . authorized || false ;
await this . handleTlsInfo ( tlsInfo ) ;
} ) ;
} ) ;
log . debug ( "monitor" , ` [ ${ this . name } ] Axios Options: ${ JSON . stringify ( options ) } ` ) ;
log . debug ( "monitor" , ` [ ${ this . name } ] Axios Options: ${ JSON . stringify ( options ) } ` ) ;
log . debug ( "monitor" , ` [ ${ this . name } ] Axios Request ` ) ;
log . debug ( "monitor" , ` [ ${ this . name } ] Axios Request ` ) ;
@ -542,31 +554,19 @@ class Monitor extends BeanModel {
bean . msg = ` ${ res . status } - ${ res . statusText } ` ;
bean . msg = ` ${ res . status } - ${ res . statusText } ` ;
bean . ping = dayjs ( ) . valueOf ( ) - startTime ;
bean . ping = dayjs ( ) . valueOf ( ) - startTime ;
// Check certificate if https is used
// fallback for if kelog event is not emitted, but we may still have tlsInfo,
let certInfoStartTime = dayjs ( ) . valueOf ( ) ;
// e.g. if the connection is made through a proxy
if ( this . getUrl ( ) ? . protocol === "https:" ) {
if ( this . getUrl ( ) ? . protocol === "https:" && tlsInfo . valid === undefined ) {
log . debug ( "monitor" , ` [ ${ this . name } ] Check cert ` ) ;
const tlsSocket = res . request . res . socket ;
try {
let tlsInfoObject = checkCertificate ( res ) ;
tlsInfo = await this . updateTlsInfo ( tlsInfoObject ) ;
if ( ! this . getIgnoreTls ( ) && this . isEnabledExpiryNotification ( ) ) {
if ( tlsSocket ) {
log . debug ( "monitor" , ` [ ${ this . name } ] call checkCertExpiryNotifications ` ) ;
tlsInfo = checkCertificate ( tlsSocket ) ;
await this . checkCertExpiryNotifications ( tlsInfoObject ) ;
tlsInfo . valid = tlsSocket . authorized || false ;
}
} catch ( e ) {
await this . handleTlsInfo ( tlsInfo ) ;
if ( e . message !== "No TLS certificate in response" ) {
log . error ( "monitor" , "Caught error" ) ;
log . error ( "monitor" , e . message ) ;
}
}
}
}
}
if ( process . env . TIMELOGGER === "1" ) {
log . debug ( "monitor" , "Cert Info Query Time: " + ( dayjs ( ) . valueOf ( ) - certInfoStartTime ) + "ms" ) ;
}
if ( process . env . UPTIME _KUMA _LOG _RESPONSE _BODY _MONITOR _ID === this . id ) {
if ( process . env . UPTIME _KUMA _LOG _RESPONSE _BODY _MONITOR _ID === this . id ) {
log . info ( "monitor" , res . data ) ;
log . info ( "monitor" , res . data ) ;
}
}
@ -599,8 +599,12 @@ class Monitor extends BeanModel {
let data = res . data ;
let data = res . data ;
// convert data to object
// convert data to object
if ( typeof data === "string" ) {
if ( typeof data === "string" && res . headers [ "content-type" ] !== "application/json" ) {
data = JSON . parse ( data ) ;
try {
data = JSON . parse ( data ) ;
} catch ( _ ) {
// Failed to parse as JSON, just process it as a string
}
}
}
let expression = jsonata ( this . jsonPath ) ;
let expression = jsonata ( this . jsonPath ) ;
@ -1615,6 +1619,20 @@ class Monitor extends BeanModel {
return oAuthAccessToken ;
return oAuthAccessToken ;
}
}
/ * *
* Store TLS certificate information and check for expiry
* @ param { Object } tlsInfo Information about the TLS connection
* @ returns { Promise < void > }
* /
async handleTlsInfo ( tlsInfo ) {
await this . updateTlsInfo ( tlsInfo ) ;
this . prometheus ? . update ( null , tlsInfo ) ;
if ( ! this . getIgnoreTls ( ) && this . isEnabledExpiryNotification ( ) ) {
log . debug ( "monitor" , ` [ ${ this . name } ] call checkCertExpiryNotifications ` ) ;
await this . checkCertExpiryNotifications ( tlsInfo ) ;
}
}
} }
module . exports = Monitor ; module . exports = Monitor ;
Louis Lam
4 weeks ago