tilia-dav 3.1.0.pre.alpha6 → 3.1.1

data/examples/sql/sqlite.addressbooks.sql

@@ -0,0 +1,28 @@
+CREATE TABLE addressbooks (
+    id integer primary key asc,
+    principaluri text,
+    displayname text,
+    uri text,
+    description text,
+    synctoken integer
+);
+
+CREATE TABLE cards (
+    id integer primary key asc,
+    addressbookid integer,
+    carddata blob,
+    uri text,
+    lastmodified integer,
+    etag text,
+    size integer
+);
+
+CREATE TABLE addressbookchanges (
+    id integer primary key asc,
+    uri text,
+    synctoken integer,
+    addressbookid integer,
+    operation integer
+);
+
+CREATE INDEX addressbookid_synctoken ON addressbookchanges (addressbookid, synctoken);

data/examples/sql/sqlite.calendars.sql

@@ -0,0 +1,64 @@
+CREATE TABLE calendarobjects (
+    id integer primary key asc,
+    calendardata blob,
+    uri text,
+    calendarid integer,
+    lastmodified integer,
+    etag text,
+    size integer,
+    componenttype text,
+    firstoccurence integer,
+    lastoccurence integer,
+    uid text
+);
+
+CREATE TABLE calendars (
+    id integer primary key asc,
+    principaluri text,
+    displayname text,
+    uri text,
+    synctoken integer,
+    description text,
+    calendarorder integer,
+    calendarcolor text,
+    timezone text,
+    components text,
+    transparent bool
+);
+
+CREATE TABLE calendarchanges (
+    id integer primary key asc,
+    uri text,
+    synctoken integer,
+    calendarid integer,
+    operation integer
+);
+
+CREATE INDEX calendarid_synctoken ON calendarchanges (calendarid, synctoken);
+
+CREATE TABLE calendarsubscriptions (
+    id integer primary key asc,
+    uri text,
+    principaluri text,
+    source text,
+    displayname text,
+    refreshrate text,
+    calendarorder integer,
+    calendarcolor text,
+    striptodos bool,
+    stripalarms bool,
+    stripattachments bool,
+    lastmodified int
+);
+
+CREATE TABLE schedulingobjects (
+    id integer primary key asc,
+    principaluri text,
+    calendardata blob,
+    uri text,
+    lastmodified integer,
+    etag text,
+    size integer
+);
+
+CREATE INDEX principaluri_uri ON calendarsubscriptions (principaluri, uri);

data/examples/sql/sqlite.locks.sql

@@ -0,0 +1,12 @@
+BEGIN TRANSACTION;
+CREATE TABLE locks (
+	id integer primary key asc,
+	owner text,
+	timeout integer,
+	created integer,
+	token text,
+	scope integer,
+	depth integer,
+	uri text
+);
+COMMIT;

data/examples/sql/sqlite.principals.sql

@@ -0,0 +1,20 @@
+CREATE TABLE principals (
+    id INTEGER PRIMARY KEY ASC,
+    uri TEXT,
+    email TEXT,
+    displayname TEXT,
+    UNIQUE(uri)
+);
+
+CREATE TABLE groupmembers (
+    id INTEGER PRIMARY KEY ASC,
+    principal_id INTEGER,
+    member_id INTEGER,
+    UNIQUE(principal_id, member_id)
+);
+
+
+INSERT INTO principals (uri,email,displayname) VALUES ('principals/admin', 'admin@example.org','Administrator');
+INSERT INTO principals (uri,email,displayname) VALUES ('principals/admin/calendar-proxy-read', null, null);
+INSERT INTO principals (uri,email,displayname) VALUES ('principals/admin/calendar-proxy-write', null, null);
+

data/examples/sql/sqlite.propertystorage.sql

@@ -0,0 +1,10 @@
+CREATE TABLE propertystorage (
+    id integer primary key asc,
+    path text,
+    name text,
+    valuetype integer,
+    value string
+);
+
+
+CREATE UNIQUE INDEX path_property ON propertystorage (path, name);

data/examples/sql/sqlite.users.sql

@@ -0,0 +1,9 @@
+CREATE TABLE users (
+	id integer primary key asc,
+	username TEXT,
+	digesta1 TEXT,
+	UNIQUE(username)
+);
+
+INSERT INTO users (username,digesta1) VALUES
+('admin',  '2bd199b750010a686f5908c2551d39b3');

data/lib/tilia/cal_dav/ics_export_plugin.rb

@@ -223,7 +223,7 @@ module Tilia
             calendar_time_zone = ActiveSupport::TimeZone.new('UTC')
           end
 
-          merged_calendar.expand(start, ending, calendar_time_zone)
+          merged_calendar = merged_calendar.expand(start, ending, calendar_time_zone)
         end
 
         response.update_header('Content-Type', format)

data/lib/tilia/cal_dav/plugin.rb

@@ -56,14 +56,25 @@ module Tilia
       # Returns the path to a principal's calendar home.
       #
       # The return url must not end with a slash.
+      # This function should return null in case a principal did not have
+      # a calendar home.
       #
       # @param string principal_url
-      # @return string
+      # @return [String, nil]
       def calendar_home_for_principal(principal_url)
-        # The default is a bit naive, but it can be overwritten.
-        node_name = Uri.split(principal_url).second
+        # The default behavior for most sabre/dav servers is that there is a
+        # principals root node, which contains users directly under it.
+        #
+        # This function assumes that there are two components in a principal
+        # path. If there's more, we don't return a calendar home. This
+        # excludes things like the calendar-proxy-read principal (which it
+        # should).
+        parts = principal_url.gsub(%r{^/+|/+$}, '').split('/')
+
+        return nil unless parts.size == 2
+        return nil unless parts[0] == 'principals'
 
-        CALENDAR_ROOT + '/' + node_name
+        return CALENDAR_ROOT + '/' + parts[1]
       end
 
       # Returns a list of features for the DAV: HTTP header.
@@ -266,8 +277,9 @@ module Tilia
           prop_find.handle(
             "{#{NS_CALDAV}}calendar-home-set",
             lambda do
-              calendar_home_path = calendar_home_for_principal(principal_url) + '/'
-              return Dav::Xml::Property::Href.new(calendar_home_path)
+              calendar_home_path = calendar_home_for_principal(principal_url)
+              return nil unless calendar_home_path
+              return Dav::Xml::Property::Href.new(calendar_home_path + '/')
             end
           )
 
@@ -385,7 +397,7 @@ module Tilia
                 time_zones[calendar_path] = time_zone
               end
 
-              v_object.expand(report.expand['start'], report.expand['end'], time_zones[calendar_path])
+              v_object = v_object.expand(report.expand['start'], report.expand['end'], time_zones[calendar_path])
             end
 
             if needs_json
@@ -487,7 +499,7 @@ module Tilia
               if !requested_calendar_data
                 properties[200].delete('{urn:ietf:params:xml:ns:caldav}calendar-data')
               else
-                v_object.expand(report.expand['start'], report.expand['end'], calendar_time_zone) if report.expand
+                v_object = v_object.expand(report.expand['start'], report.expand['end'], calendar_time_zone) if report.expand
 
                 if needs_json
                   properties[200]["{#{NS_CALDAV}}calendar-data"] = v_object.json_serialize.to_json
@@ -506,10 +518,14 @@ module Tilia
         end
 
         if node.is_a?(ICalendarObjectContainer) && depth == 0
-          if @server.http_request.header('User-Agent').to_s.index('MSFT-WP/') == 0
-            # Windows phone incorrectly supplied depth as 0, when it actually
+          if @server.http_request.header('User-Agent').to_s.index('MSFT-') == 0
+            # Microsoft clients incorrectly supplied depth as 0, when it actually
             # should have set depth to 1. We're implementing a workaround here
             # to deal with this.
+            #
+            # This targets at least the following clients:
+            #   Windows 10
+            #   Windows Phone 8, 10
             depth = 1
           else
             fail Dav::Exception::BadRequest, 'A calendar-query REPORT on a calendar with a Depth: 0 is undefined. Set Depth to 1'
@@ -527,7 +543,7 @@ module Tilia
             if needs_json || report.expand
               v_object = VObject::Reader.read(properties[200]["{#{NS_CALDAV}}calendar-data"])
 
-              v_object.expand(report.expand['start'], report.expand['end'], calendar_time_zone) if report.expand
+              v_object = v_object.expand(report.expand['start'], report.expand['end'], calendar_time_zone) if report.expand
 
               if needs_json
                 properties[200]["{#{NS_CALDAV}}calendar-data"] = v_object.json_serialize.to_json

data/lib/tilia/cal_dav/schedule/i_mip_plugin.rb

@@ -71,8 +71,8 @@ module Tilia
 
           summary = i_tip_message.message['VEVENT']['SUMMARY'].to_s
 
-          return nil unless Uri.parse(i_tip_message.sender)['scheme'] == 'mailto'
-          return nil unless Uri.parse(i_tip_message.recipient)['scheme'] == 'mailto'
+          return nil unless Uri.parse(i_tip_message.sender)[:scheme] == 'mailto'
+          return nil unless Uri.parse(i_tip_message.recipient)[:scheme] == 'mailto'
 
           sender = i_tip_message.sender[7..-1]
           recipient = i_tip_message.recipient[7..-1]

data/lib/tilia/cal_dav/schedule/plugin.rb

@@ -146,6 +146,8 @@ module Tilia
               "{#{NS_CALDAV}}schedule-outbox-URL",
               lambda do
                 calendar_home_path = caldav_plugin.calendar_home_for_principal(principal_url)
+                return nil unless calendar_home_path
+
                 outbox_path = calendar_home_path + '/outbox/'
 
                 return Dav::Xml::Property::Href.new(outbox_path)
@@ -157,6 +159,8 @@ module Tilia
               "{#{NS_CALDAV}}schedule-inbox-URL",
               lambda do
                 calendar_home_path = caldav_plugin.calendar_home_for_principal(principal_url)
+                return nil unless calendar_home_path
+
                 inbox_path = calendar_home_path + '/inbox/'
 
                 return Dav::Xml::Property::Href.new(inbox_path)
@@ -169,6 +173,7 @@ module Tilia
                 # We don't support customizing this property yet, so in the
                 # meantime we just grab the first calendar in the home-set.
                 calendar_home_path = caldav_plugin.calendar_home_for_principal(principal_url)
+                return nil unless calendar_home_path
 
                 sccs = "{#{NS_CALDAV}}supported-calendar-component-set"
 
@@ -196,6 +201,8 @@ module Tilia
                     return Dav::Xml::Property::Href.new(child['href'])
                   end
                 end
+
+                nil
               end
             )
 

data/lib/tilia/dav/auth/backend.rb

@@ -4,6 +4,7 @@ module Tilia
       module Backend
         require 'tilia/dav/auth/backend/backend_interface'
         require 'tilia/dav/auth/backend/abstract_basic'
+        require 'tilia/dav/auth/backend/abstract_bearer'
         require 'tilia/dav/auth/backend/abstract_digest'
         require 'tilia/dav/auth/backend/apache'
         require 'tilia/dav/auth/backend/basic_call_back'

data/lib/tilia/dav/auth/backend/abstract_basic.rb

@@ -108,8 +108,9 @@ module Tilia
           end
 
           # TODO: document
-          def initialize
-            @realm = 'sabre/dav'
+          def initialize *args
+            super
+            @realm = 'tilia/dav'
             @principal_prefix = 'principals/'
           end
         end

data/lib/tilia/dav/auth/backend/abstract_bearer.rb

@@ -0,0 +1,116 @@
+module Tilia
+  module Dav
+    module Auth
+      module Backend
+        # HTTP Bearer authentication backend class
+        #
+        # This class can be used by authentication objects wishing to use HTTP Bearer
+        # Most of the digest logic is handled, implementors just need to worry about
+        # the validateBearerToken method.
+        class AbstractBearer
+          include BackendInterface
+
+          protected
+
+          # Validates a Bearer token
+          #
+          # This method should return the full principal url, or false if the
+          # token was incorrect.
+          #
+          # @param string bearer_token
+          # @return string|false
+          def validate_bearer_token(bearer_token)
+          end
+
+          public
+
+          # Sets the authentication realm for this backend.
+          #
+          # @param string realm
+          # @return void
+          attr_writer :realm
+
+          # When this method is called, the backend must check if authentication was
+          # successful.
+          #
+          # The returned value must be one of the following
+          #
+          # [true, "principals/username"]
+          # [false, "reason for failure"]
+          #
+          # If authentication was successful, it's expected that the authentication
+          # backend returns a so-called principal url.
+          #
+          # Examples of a principal url:
+          #
+          # principals/admin
+          # principals/user1
+          # principals/users/joe
+          # principals/uid/123457
+          #
+          # If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+          # return a string such as:
+          #
+          # principals/users/[username]
+          #
+          # @param RequestInterface request
+          # @param ResponseInterface response
+          # @return array
+          def check(request, response)
+            auth = Http::Auth::Bearer.new(
+              @realm,
+              request,
+              response
+            )
+
+            bearer_token = auth.token
+            if bearer_token.blank?
+              return [false, "No 'Authorization: Bearer' header found. Either the client didn't send one, or the server is mis-configured"]
+            end
+
+            principal_url = validate_bearer_token(bearer_token)
+            if principal_url.blank?
+              return [false, "Bearer token was incorrect"]
+            end
+
+            return [true, principal_url]
+          end
+
+          # This method is called when a user could not be authenticated, and
+          # authentication was required for the current request.
+          #
+          # This gives you the opportunity to set authentication headers. The 401
+          # status code will already be set.
+          #
+          # In this case of Bearer Auth, this would for example mean that the
+          # following header needs to be set:
+          #
+          # response.add_header('WWW-Authenticate', 'Bearer realm=SabreDAV')
+          #
+          # Keep in mind that in the case of multiple authentication backends, other
+          # WWW-Authenticate headers may already have been set, and you'll want to
+          # append your own WWW-Authenticate header instead of overwriting the
+          # existing one.
+          #
+          # @param RequestInterface request
+          # @param ResponseInterface response
+          # @return void
+          def challenge(request, response)
+            auth = Http::Auth::Bearer.new(
+              @realm,
+              request,
+              response
+            )
+            auth.require_login
+          end
+
+          # TODO: document
+          def initialize *args
+            @realm = 'tilia/dav'
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tilia/dav/auth/backend/abstract_digest.rb

@@ -121,8 +121,9 @@ module Tilia
           end
 
           # TODO: document
-          def initialize
-            @realm = 'TiliaDAV'
+          def initialize *args
+            super
+            @realm = 'tilia/dav'
             @principal_prefix = 'principals/'
           end
         end

data/lib/tilia/dav/auth/backend/apache.rb

@@ -75,7 +75,8 @@ module Tilia
           def challenge(_request, _response)
           end
 
-          def initialize
+          def initialize *args
+            super
             @principal_prefix = 'principals/'
           end
         end