psw/mailautoconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added MSAutodiscoverJSONError codes - still testing

Browse source
This commit is contained in:
Paul Wilde 2021-08-12 10:32:32 +01:00
parent a5d2e50249
commit 6301cbb595
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core/init/responder.php
View file

@ -18,13 +18,13 @@ class Responder {
case "json": case "json":
header('Content-Type: application/json'); header('Content-Type: application/json');
// Send json encoded response // Send json encoded response
echo json_encode($response, true); echo json_encode($response);
break; break;
case "ms-json": case "ms-json":
header('Content-Type: application/json'); header('Content-Type: application/json');
// Send json encoded response // Send json encoded response
// This is currently an undocumented file from Microsoft so it's not ready yet // This is currently an undocumented file from Microsoft so it's not ready yet
echo json_encode($response->content, true); echo json_encode($response->content, JSON_UNESCAPED_UNICODE);
break; break;
case "xml": case "xml":
header('Content-Type: application/xml'); header('Content-Type: application/xml');
@ -98,9 +98,18 @@ class Responder {
// The new Microsoft Autodiscover.json file - undocumented // The new Microsoft Autodiscover.json file - undocumented
$response = new Response(); $response = new Response();
$response->content_type = "ms-json"; $response->content_type = "ms-json";
$response->content = new MSAutodiscoverJSONResponse(); if (strtolower($_GET['Protocol']) == 'autodiscoverv1') {
$response->content->Protocol = "AutodiscoverV1"; $response->content = new MSAutodiscoverJSONResponse();
$response->content->Url = Core::$Config["BaseURL"] . "/Autodiscover/Autodiscover.xml"; $response->content->Protocol = "AutodiscoverV1";
$response->content->Url = Core::$Config["BaseURL"] . "/Autodiscover/Autodiscover.xml";
} else {
$response->content = new MSAutodiscoverJSONError();
http_response_code(400);
$response->headers_set = true;
$response->content->ErrorCode = "InvalidProtocol";
$response->content->ErrorMessage = "The given protocol value '" . $_GET['Protocol'] . "' is invalid. Supported values are 'AutodiscoverV1'";
}
return $response; return $response;
} }
private function dummy_response(){ private function dummy_response(){
@ -115,7 +124,7 @@ class Responder {
private function get_test_working(){ private function get_test_working(){
// Generate a dummy response for testing // Generate a dummy response for testing
$response = new Response(); $response = new Response();
$response->message = "Success! Things are working! Please request a valid URL i.e. get/all"; $response->message = "Success! Things are working! Please request a valid URL i.e. /mail/config-v1.1.xml";
return $response; return $response;
} }
} }
@ -123,6 +132,7 @@ class Response {
public $url; public $url;
public $content_type = "json"; public $content_type = "json";
public $message; public $message;
public $headers_set = false;
public $content = array(); public $content = array();
public function __construct(){ public function __construct(){
// add requested page to response. I don't know why, but it could helpful for diagnostics at some point // add requested page to response. I don't know why, but it could helpful for diagnostics at some point
@ -137,8 +147,9 @@ class Response {
} }
} }
class AutoConfig { class AutoConfig {
public prepare_autoconfig_info(){ public function prepare_autoconfig_info() {
// TODO: Move all the code in autoconfig.php into here // TODO: Move all the code in autoconfig.php into here
return false;
} }
} }
class MSAutodiscoverJSONResponse { class MSAutodiscoverJSONResponse {
@ -146,3 +157,7 @@ class MSAutodiscoverJSONResponse {
public $Protocol; public $Protocol;
public $Url; public $Url;
} }
class MSAutodiscoverJSONError {
public $ErrorCode;
public $ErrorMessage;
}