client-side ALPN support

cassandane/Cassandane/Cyrus/TestCase.pm

@@ -795,49 +795,42 @@ sub _setup_http_service_objects
 {
     my ($self) = @_;
 
-    # nothing to do if no http service
-    require Mail::JMAPTalk;
-    require Net::CalDAVTalk;
-    require Net::CardDAVTalk;
-
+    # nothing to do if no http or https service
     my $service = $self->{instance}->get_service("http");
+    $service ||= $self->{instance}->get_service("https");
     return if !$service;
 
+    my %common_args = (
+        user => 'cassandane',
+        password => 'pass',
+        host => $service->host(),
+        port => $service->port(),
+        scheme => ($service->is_ssl() ? 'https' : 'http'),
+    );
+
     if ($self->{instance}->{config}->get_bit('httpmodules', 'carddav')) {
         require Net::CardDAVTalk;
         $self->{carddav} = Net::CardDAVTalk->new(
-            user => 'cassandane',
-            password => 'pass',
-            host => $service->host(),
-            port => $service->port(),
-            scheme => 'http',
+            %common_args,
             url => '/',
             expandurl => 1,
         );
     }
     if ($self->{instance}->{config}->get_bit('httpmodules', 'caldav')) {
         require Net::CalDAVTalk;
         $self->{caldav} = Net::CalDAVTalk->new(
-            user => 'cassandane',
-            password => 'pass',
-            host => $service->host(),
-            port => $service->port(),
-            scheme => 'http',
+            %common_args,
             url => '/',
             expandurl => 1,
         );
         $self->{caldav}->UpdateAddressSet("Test User",
-                                            "cassandane\@example.com");
+                                          "cassandane\@example.com");
     }
     if ($self->{instance}->{config}->get_bit('httpmodules', 'jmap')) {
         require Mail::JMAPTalk;
         $ENV{DEBUGJMAP} = 1;
         $self->{jmap} = Mail::JMAPTalk->new(
-            user => 'cassandane',
-            password => 'pass',
-            host => $service->host(),
-            port => $service->port(),
-            scheme => 'http',
+            %common_args,
             url => '/jmap/',
         );
     }

cassandane/Cassandane/IMAPMessageStore.pm

@@ -97,6 +97,10 @@ sub connect
 
     if ($self->{ssl}) {
         my $ca_file = abs_path("data/certs/cacert.pem");
+        my $alpn_map = exists $params{OverrideALPN}
+                     ? delete $params{OverrideALPN}
+                     : [ 'imap' ];
+
         # XXX https://github.com/noxxi/p5-io-socket-ssl/issues/121
         # XXX With newer IO::Socket::SSL, hostname verification fails
         # XXX because our hostname is an IP address and the certificate
@@ -111,6 +115,7 @@ sub connect
                       UseSSL => $self->{ssl},
                       SSL_ca_file => $ca_file,
                       SSL_verifycn_scheme => 'none',
+                      SSL_alpn_protocols => $alpn_map,
                       UseBlocking => 1,  # must be blocking for SSL
                       Pedantic => 1,
                       PreserveINBOX => 1,

cassandane/Cassandane/Service.pm

@@ -108,6 +108,15 @@ sub set_port
     return $self->{_listener}->set_port($port);
 }
 
+sub is_ssl
+{
+    my ($self) = @_;
+
+    # assume '-s' service argument indicates SSL and its absense
+    # indicates plaintext
+    return scalar grep { $_ eq '-s' } @{$self->{argv}};
+}
+
 # Return a hash of parameters suitable for passing
 # to MessageStoreFactory::create.
 sub store_params

cassandane/Cassandane/ServiceFactory.pm

@@ -60,29 +60,23 @@ sub create
     }
 
     # try and guess some service-specific defaults
-    if ($name =~ m/imaps/)
+    if ($name =~ m/imap(s?)/)
     {
-        return Cassandane::IMAPService->new(
-                                argv => ['imapd', '-s'],
-                                %params);
-    }
-    elsif ($name =~ m/imap/)
-    {
-        return Cassandane::IMAPService->new(
-                                argv => ['imapd'],
-                                %params);
+        my @argv = 'imapd';
+        push @argv, '-s' if $1;
+        return Cassandane::IMAPService->new(argv => \@argv, %params);
     }
     elsif ($name =~ m/sync/)
     {
         return Cassandane::Service->new(
                                 argv => ['imapd'],
                                 %params);
     }
-    elsif ($name =~ m/http/)
+    elsif ($name =~ m/http(s?)/)
     {
-        return Cassandane::Service->new(
-                                argv => ['httpd'],
-                                %params);
+        my @argv = 'httpd';
+        push @argv, '-s' if $1;
+        return Cassandane::Service->new(argv => \@argv, %params);
     }
     elsif ($name =~ m/lmtp/)
     {