nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-29 03:14:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

verify required headers are signed

Browse Source
This commit is contained in:
Rob Ostensen 2012-03-11 00:11:44 -06:00 committed by Andrew McMillan
parent db57e81b8d
commit ff006ce319
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/iSchedule.php
View File

@ -34,10 +34,10 @@ class iSchedule
private $failOnError = true; private $failOnError = true;
private $subdomainsOK = true; private $subdomainsOK = true;
private $remote_public_key ; private $remote_public_key ;
private $required_headers = Array ( 'Host', // draft 01 section 7.1 required headers private $required_headers = Array ( 'host', // draft 01 section 7.1 required headers
'Originator', 'originator',
'Recipient', 'recipient',
'Content-Type' ); 'content-type' );
private $disallowed_headers = Array ( 'connection', // draft 01 section 7.1 disallowed headers private $disallowed_headers = Array ( 'connection', // draft 01 section 7.1 disallowed headers
'keep-alive', 'keep-alive',
'dkim-signature', 'dkim-signature',
@ -539,9 +539,16 @@ class iSchedule
return 'missing list of signed headers'; return 'missing list of signed headers';
$this->signed_headers = preg_split ( '/:/', $dkim['h'] ); $this->signed_headers = preg_split ( '/:/', $dkim['h'] );
$sh = Array ();
foreach ( $this->signed_headers as $h ) foreach ( $this->signed_headers as $h )
{
$sh[] = strtolower ( $h );
if ( in_array ( strtolower ( $h ), $this->disallowed_headers ) ) if ( in_array ( strtolower ( $h ), $this->disallowed_headers ) )
return "$h is NOT allowed in signed header fields per RFC4871 or iSchedule"; return "$h is NOT allowed in signed header fields per RFC4871 or iSchedule";
}
foreach ( $this->required_headers as $h )
if ( ! in_array ( strtolower ( $h ), $sh ) )
return "$h is REQUIRED but missing in signed header fields per iSchedule";
// body hash REQUIRED // body hash REQUIRED
if ( ! isset ( $dkim['bh'] ) ) if ( ! isset ( $dkim['bh'] ) )
return 'missing body signature'; return 'missing body signature';