Compare commits

..

No commits in common. "6301cbb5956eaffc72122e78a828c86b8e5ed567" and "aa611b2a1d4eb740ae004fe4e01ddf122ef12f82" have entirely different histories.

7 changed files with 12 additions and 58 deletions

View file

@ -5,7 +5,7 @@ MailAutoConf is autodiscover/autoconfig web server for self-hosted mail services
which do not have their own autodiscover service.
## What does MailAutoConf do?
MailAutoConf is currently in _very_ early stages, but it does generate valid
MailAutoConf is currently in _very_early stages, but it does generate valid
autoconfig XML files (/mail/config-v1.1.xml) compatible with many mail clients
i.e. Thunderbird, Evolution, etc.
Theoretically, anything that can read the standard autoconfig XML file -

View file

@ -7,7 +7,6 @@
}
public static function get_post_data(){
// Gets the POST request into an array
$data = [];
foreach($_POST as $key=>$value){
$data[$key] = $value;
@ -15,7 +14,6 @@
return $data;
}
public static function get_get_data(){
// Gets the GET request into an array
$data = [];
foreach($_GET as $key=>$value){
$data[$key] = $value;
@ -23,7 +21,6 @@
return $data;
}
public static function random_string($length = 10) {
// Generates a random string - unused currently
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters);
$randomString = '';
@ -33,7 +30,6 @@
return $randomString;
}
public static function start_session(){
// Starts a session, unused currently
session_start();
}
public static function end_session($redirect = true){
@ -47,7 +43,6 @@
}
}
public static function get_current_git_commit( $branch='master' ) {
// Gets the current git commit ID - for testing
$gitref = sprintf( self::root_dir().'/../.git/refs/heads/%s', $branch );
if ( file_exists($gitref) && $hash = file_get_contents( $gitref ) ) {
return trim($hash);
@ -56,7 +51,6 @@
}
}
public static function full_url(){
// Gets the full requested URL
if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
$addr = "https";
} else {

View file

@ -3,7 +3,6 @@ class Errors {
public function throw_error($err){
header('Content-Type: application/json'); // <-- header declaration
$error = false;
// Some Saved error messages - more to be added
switch ($err) {
case "NotFound":
$error = new ErrorMessage("Error","404","Not Found");
@ -15,7 +14,6 @@ class Errors {
$error = new ErrorMessage("Error","500","Internal Error");
break;
}
// Output error in JSON format
echo json_encode($error, true); // <--- encode
}
}

View file

@ -1,14 +1,11 @@
<?php
// require all necessary files
require ("core.php");
require ("user.php");
require ("responder.php");
require ("errors.php");
class Loader {
public function request_page(){
// Check if user is authenticated and go to the relevant section
// Currently no authentication is in place so should always be true
if (User::is_authenticated()){
$this->go_to_page(true);
} else {
@ -23,7 +20,6 @@ class Loader {
default:
$p = $this->get_page_name();
if(substr($p,0,1) == "/") {
// Remove first slash if exists
Core::$CurrentPage = substr($p,1);
} else {
Core::$CurrentPage = $p;

View file

@ -18,13 +18,12 @@ class Responder {
case "json":
header('Content-Type: application/json');
// Send json encoded response
echo json_encode($response);
echo json_encode($response, true);
break;
case "ms-json":
header('Content-Type: application/json');
// Send json encoded response
// This is currently an undocumented file from Microsoft so it's not ready yet
echo json_encode($response->content, JSON_UNESCAPED_UNICODE);
echo json_encode($response->content, true);
break;
case "xml":
header('Content-Type: application/xml');
@ -36,7 +35,6 @@ class Responder {
}
private function get_response(){
$resp = false;
// Handle the requested URL, using as many known autoconfiguration urls as possible
switch (Core::$CurrentPage){
case "get/test":
$resp = $this->dummy_response();
@ -44,7 +42,6 @@ class Responder {
case "get/all":
$resp = $this->all_urls();
break;
case "mail/autoconfig.xml":
case "mail/config-v1.1.xml":
$resp = $this->moz_auto_config();
break;
@ -52,7 +49,7 @@ class Responder {
case "Autodiscover/Autodiscover.xml":
$resp = $this->ms_autodiscover();
break;
case "autodiscover/autodiscover.json":
case "autodiscover/autodiscover.json": //?Email=psw%40wilde.cloud&Protocol=Autodiscoverv1&RedirectCount=1"
case "Autodiscover/Autodiscover.json":
$resp = $this->ms_autodiscover_json();
break;
@ -69,7 +66,7 @@ class Responder {
}
private function all_urls(){
$response = new Response();
// Not really useful, unless some lovely app developers want to parse it for their app :)
// TODO:: Will work out a better message later
$response->message = "All URLs Requested";
@ -81,35 +78,23 @@ class Responder {
return $response;
}
private function moz_auto_config(){
// The default Thunderbird or Evolution autoconfig.xml file
$response = new Response();
$response->content_type = "xml";
$response->content = "public/autoconfig.php";
return $response;
}
private function ms_autodiscover(){
// The default Microsoft Autodiscover.xml file
$response = new Response();
$response->content_type = "xml";
$response->content = "public/autodiscover.php";
return $response;
}
private function ms_autodiscover_json(){
// The new Microsoft Autodiscover.json file - undocumented
$response = new Response();
$response->content_type = "ms-json";
if (strtolower($_GET['Protocol']) == 'autodiscoverv1') {
$response->content = new MSAutodiscoverJSONResponse();
$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;
}
private function dummy_response(){
@ -124,7 +109,7 @@ class Responder {
private function get_test_working(){
// Generate a dummy response for testing
$response = new Response();
$response->message = "Success! Things are working! Please request a valid URL i.e. /mail/config-v1.1.xml";
$response->message = "Success! Things are working! Please request a valid URL i.e. get/all";
return $response;
}
}
@ -132,11 +117,9 @@ class Response {
public $url;
public $content_type = "json";
public $message;
public $headers_set = false;
public $content = array();
public function __construct(){
// add requested page to response. I don't know why, but it could helpful for diagnostics at some point
// Does not happen on autoconfig.xml/autodisocver.xml/autodiscover.json files
$this->url = Core::$CurrentPage;
if (!Core::$Config["CommitID"]){
$this->version = Core::VERSION;
@ -146,18 +129,7 @@ class Response {
}
}
class AutoConfig {
public function prepare_autoconfig_info() {
// TODO: Move all the code in autoconfig.php into here
return false;
}
}
class MSAutodiscoverJSONResponse {
// More work to do - handling of MS Autodiscover.json requests
public $Protocol;
public $Url;
}
class MSAutodiscoverJSONError {
public $ErrorCode;
public $ErrorMessage;
}

View file

@ -1,13 +1,4 @@
<?php
// Errrrrrrrrgh, this is sooooo messy, I'm going to tidy this up
// It's basically configuring the format of the email address dependent on
// variables set in the config file.
// i.e. if the domain isn't required for authentication then it strips the
// username back to just the pre-@ part. Or, if the username requires a different
// logon domain, then it replaces the email domain with the localdomain
//
// TODO: TIDY THIS UP!!
$conf = Core::$Config["Services"];
$data = Core::get_get_data();
$email_provided = false;

View file

@ -2,7 +2,10 @@
$conf = Core::$Config["Services"];
//get raw POST data so we can extract the email address
$data = file_get_contents("php://input");
// file_put_contents(Core::root_dir()."/xmltest", $data);
preg_match("/\<EMailAddress\>(.*?)\<\/EMailAddress\>/", $data, $matches);
//print_r($matches);
// Example POST Request (sent from client) :
// <?xml version="1.0" \?\>