Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
commit
0fac35686b
@ -64,8 +64,6 @@ class Cdav extends \Zotlabs\Web\Controller {
|
||||
if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
|
||||
$record = null;
|
||||
}
|
||||
// requires security review
|
||||
$record = null;
|
||||
if($record['account']) {
|
||||
authenticate_success($record['account']);
|
||||
if($channel_login) {
|
||||
|
@ -73,8 +73,6 @@ class Dav extends \Zotlabs\Web\Controller {
|
||||
if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
|
||||
$record = null;
|
||||
}
|
||||
// requires security review
|
||||
$record = null;
|
||||
if($record['account']) {
|
||||
authenticate_success($record['account']);
|
||||
if($channel_login) {
|
||||
|
@ -85,8 +85,7 @@ function api_login(&$a){
|
||||
else {
|
||||
continue;
|
||||
}
|
||||
// requires security review
|
||||
$record = null;
|
||||
|
||||
if($record) {
|
||||
$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
|
||||
if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
|
||||
|
Reference in New Issue
Block a user