Request 2126 (accepted)

Overview

Request 2126 (accepted)

Check in version 0.2

Created by vanmeeuwen over 7 years ago
In state accepted

Submit kolab-autoconf

Submit package Kolab:Winterfell / kolab-autoconf to package Kolab:16 / kolab-autoconf

kolab-autoconf.spec Changed

debian.changelog Changed

kolab-autoconf-0.1.tar.gz/docs/README -> kolab-autoconf-0.2.tar.gz/docs/README Changed

@@ -23,12 +23,12 @@
 1. Apache
 
 # for https://domain.tld (and https://autodiscover.domain.tld)
-Alias /autodiscover/autodiscover.xml /usr/share/kolab-autodiscover/public_html
-Alias /Autodiscover/Autodiscover.xml /usr/share/kolab-autodiscover/public_html
-Alias /AutoDiscover/AutoDiscover.xml /usr/share/kolab-autodiscover/public_html
+Alias /autodiscover/autodiscover.xml /usr/share/kolab-autoconf/public_html/index.php
+Alias /Autodiscover/Autodiscover.xml /usr/share/kolab-autoconf/public_html/index.php
+Alias /AutoDiscover/AutoDiscover.xml /usr/share/kolab-autoconf/public_html/index.php
 # for http://autoconfig.domain.tld
-Alias /mail/config-v1.1.xml /usr/share/kolab-autodiscover/public_html
-# for http://domain.tld
-Alias /.well-known/autoconfig/mail/config-v1.1.xml /usr/share/kolab-autodiscover/public_html
+Alias /mail/config-v1.1.xml /usr/share/kolab-autoconf/public_html/index.php
+# for http://domain.tld/index.php
+Alias /.well-known/autoconfig/mail/config-v1.1.xml /usr/share/kolab-autoconf/public_html/index.php
 
 2. Add [autodiscover] section in /etc/kolab/kolab.conf (see sample kolab.conf.sample)

kolab-autoconf-0.1.tar.gz/docs/kolab-autoconf.conf -> kolab-autoconf-0.2.tar.gz/docs/kolab-autoconf.conf Changed

@@ -1,11 +1,11 @@
 # for https://domain.tld (and https://autodiscover.domain.tld)
-Alias /autodiscover/autodiscover.xml /usr/share/kolab-autoconf/public_html
-Alias /Autodiscover/Autodiscover.xml /usr/share/kolab-autoconf/public_html
-Alias /AutoDiscover/AutoDiscover.xml /usr/share/kolab-autoconf/public_html
+Alias /autodiscover/autodiscover.xml /usr/share/kolab-autoconf/public_html/index.php
+Alias /Autodiscover/Autodiscover.xml /usr/share/kolab-autoconf/public_html/index.php
+Alias /AutoDiscover/AutoDiscover.xml /usr/share/kolab-autoconf/public_html/index.php
 # for http://autoconfig.domain.tld
-Alias /mail/config-v1.1.xml /usr/share/kolab-autoconf/public_html
+Alias /mail/config-v1.1.xml /usr/share/kolab-autoconf/public_html/index.php
 # for http://domain.tld
-Alias /.well-known/autoconfig/mail/config-v1.1.xml /usr/share/kolab-autoconf/public_html
+Alias /.well-known/autoconfig/mail/config-v1.1.xml /usr/share/kolab-autoconf/public_html/index.php
 
 <Directory "/usr/share/kolab-autoconf/public_html">
     AllowOverride None

kolab-autoconf-0.1.tar.gz/lib/AutodiscoverMicrosoft.php -> kolab-autoconf-0.2.tar.gz/lib/AutodiscoverMicrosoft.php Changed

@@ -40,9 +40,7 @@
     protected function handle_request()
     {
         $post = $_SERVER['REQUEST_METHOD'] == 'POST' ? file_get_contents('php://input') : null;
-//$this->email = 'alec@alec.pl';
-//$this->type = 'mobilesync';
-//return;
+
         Log::debug('Request [microsoft]: ' . $post);
 
         if (empty($post)) {
@@ -52,12 +50,19 @@
         // parse XML
         try {
             $xml = new SimpleXMLElement($post);
+            $ns  = $xml->getDocNamespaces();
+
+            if (empty($ns) || empty($ns[''])) {
+                $this->error("Invalid input. Missing XML request schema");
+            }
 
-            if ($email = $xml->xpath('/Autodiscover/Request/EMailAddress')) {
+            $xml->registerXPathNamespace('request', $ns['']);
+
+            if ($email = $xml->xpath('//request:EMailAddress')) {
                 $this->email = (string) array_shift($email);
             }
 
-            if ($schema = $xml->xpath('/Autodiscover/Request/AcceptableResponseSchema')) {
+            if ($schema = $xml->xpath('//request:AcceptableResponseSchema')) {
                 $schema = (string) array_shift($schema);
 
                 if (strpos($schema, 'mobilesync')) {
@@ -105,10 +110,10 @@
         $xml = new DOMDocument('1.0', Autodiscover::CHARSET);
 
         // create main elements (tree)
-        $doc = $xml->createElementNS(self::MOBILESYNC_NS, 'Autodiscover');
+        $doc = $xml->createElementNS(self::NS, 'Autodiscover');
         $doc = $xml->appendChild($doc);
 
-        $response = $xml->createElement('Response');
+        $response = $xml->createElementNS(self::MOBILESYNC_NS, 'Response');
         $response = $doc->appendChild($response);
 
         $user = $xml->createElement('User');
@@ -124,14 +129,14 @@
         $server = $settings->appendChild($server);
 
         // configuration
-/*
+
         $dispname = $xml->createElement('DisplayName');
         $dispname = $user->appendChild($dispname);
-        $dispname->appendChild($xml->createTextNode($this->config['user']));
-*/
+        $dispname->appendChild($xml->createTextNode($this->config['username']));
+
         $email = $xml->createElement('EMailAddress');
         $email = $user->appendChild($email);
-        $email->appendChild($xml->createTextNode($this->config['email']));
+        $email->appendChild($xml->createTextNode($this->config['login'] ?: $this->config['email']));
 
         $element = $xml->createElement('Type');
         $element = $server->appendChild($element);
@@ -177,11 +182,11 @@
         $action->appendChild($xml->createTextNode('settings'));
 
         // configuration
-/*
+
         $dispname = $xml->createElement('DisplayName');
         $dispname = $user->appendChild($dispname);
-        $dispname->appendChild($xml->createTextNode($this->config['user']));
-*/
+        $dispname->appendChild($xml->createTextNode($this->config['username']));
+
         $email = $xml->createElement('AutoDiscoverSMTPAddress');
         $email = $user->appendChild($email);
         $email->appendChild($xml->createTextNode($this->config['email']));

kolab-autoconf.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2126 0

Request History

vanmeeuwen created request over 7 years ago

Check in version 0.2

vanmeeuwen accepted review over 7 years ago

vanmeeuwen approved review over 7 years ago

vanmeeuwen accepted request over 7 years ago