Fix sorting of service use_backend configs to prefer more-specifics

lib/kontena/templates/haproxy/http_in.text.erb

@@ -33,12 +33,12 @@ listen http-in
   <% end %>
 <% end %>
 
-<% services.select { |s| s.virtual_hosts? && s.virtual_paths? }.each do |service| %>
-    use_backend <%= service.name %> if host_<%= service.name %> host_<%= service.name %>_virtual_path
-<% end %>
-<% services.select { |s| s.virtual_hosts? && !s.virtual_paths? }.each do |service| %>
-    use_backend <%= service.name %> if host_<%= service.name %>
-<% end %>
-<% services.select { |s| s.virtual_paths? && !s.virtual_hosts? }.each do |service| %>
-    use_backend <%= service.name %> if host_<%= service.name %>_virtual_path
+<% sorted_services.each do |service| %>
+  <% if service.virtual_hosts? && service.virtual_paths? %>
+      use_backend <%= service.name %> if host_<%= service.name %> host_<%= service.name %>_virtual_path
+  <% elsif service.virtual_hosts? %>
+      use_backend <%= service.name %> if host_<%= service.name %>
+  <% elsif service.virtual_paths? %>
+      use_backend <%= service.name %> if host_<%= service.name %>_virtual_path
+  <% end %>
 <% end %>

lib/kontena/views/http_in.rb

@@ -25,5 +25,23 @@ def health_uri
         _raw uri
       end
     end
+
+    # sort services from most specific match to least specific match
+    #
+    # @return [Array<Kontena::Models::Service>]
+    def sorted_services
+      services.sort{|a, b|
+        if a.virtual_hosts != b.virtual_hosts
+          # reverse order, empty list goes last, wildcards go last
+          b.virtual_hosts <=> a.virtual_hosts
+        elsif a.virtual_paths != b.virtual_paths
+          # reverse order, empty list goes last, longer prefixes go first
+          b.virtual_paths <=> a.virtual_paths
+        else
+          # alphabetically on service name if duplicates
+          a.name <=> b.name
+        end
+      }
+    end
   end
 end

test/virtual_host_test.bats

@@ -4,9 +4,7 @@ load "common"
 
 
 setup() {
-  etcdctl rm --recursive /kontena/haproxy/lb/services/service-a || true
-  etcdctl rm --recursive /kontena/haproxy/lb/services/service-b || true
-  etcdctl rm --recursive /kontena/haproxy/lb/services/service-c || true
+  etcdctl rm --recursive /kontena/haproxy/lb/services || true
 }
 
 
@@ -130,6 +128,24 @@ setup() {
   [ "${lines[0]}" = "service-b" ]
 }
 
+@test "prioritizes specific subdomain over wildcard" {
+  etcdctl set /kontena/haproxy/lb/services/service-b/virtual_hosts *.bar.com
+  etcdctl set /kontena/haproxy/lb/services/service-b/upstreams/server service-b:9292
+
+  etcdctl set /kontena/haproxy/lb/services/service-c/virtual_hosts test.bar.com
+  etcdctl set /kontena/haproxy/lb/services/service-c/upstreams/server service-c:9292
+
+  sleep 1
+
+  run curl -s -H "Host: www.bar.com" http://localhost:8180/
+  [ "$status" -eq 0 ]
+  [ "${lines[0]}" = "service-b" ]
+
+  run curl -s -H "Host: test.bar.com" http://localhost:8180/
+  [ "$status" -eq 0 ]
+  [ "${lines[0]}" = "service-c" ]
+}
+
 @test "prioritizes first vhost+vpath, then vhost and finally vpath" {
   etcdctl set /kontena/haproxy/lb/services/service-a/virtual_path /
   etcdctl set /kontena/haproxy/lb/services/service-a/upstreams/server service-a:9292

test/virtual_path_test.bats

@@ -4,9 +4,7 @@ load "common"
 
 
 setup() {
-  etcdctl rm --recursive /kontena/haproxy/lb/services/service-a || true
-  etcdctl rm --recursive /kontena/haproxy/lb/services/service-b || true
-  etcdctl rm --recursive /kontena/haproxy/lb/services/service-c || true
+  etcdctl rm --recursive /kontena/haproxy/lb/services || true
 }
 
 
@@ -51,3 +49,21 @@ setup() {
   [ "${lines[0]}" = "service-a" ]
   [ "${lines[1]}" = "/virtual_path" ]
 }
+
+@test "sorts overlapping virtual_paths correctly" {
+  etcdctl set /kontena/haproxy/lb/services/service-a/virtual_path /
+  etcdctl set /kontena/haproxy/lb/services/service-a/upstreams/server service-a:9292
+  etcdctl set /kontena/haproxy/lb/services/service-b/virtual_path /test/foo
+  etcdctl set /kontena/haproxy/lb/services/service-b/upstreams/server service-b:9292
+  etcdctl set /kontena/haproxy/lb/services/service-c/virtual_path /test/
+  etcdctl set /kontena/haproxy/lb/services/service-c/upstreams/server service-c:9292
+
+  sleep 1
+
+  run curl -s http://localhost:8180/path
+  [ "${lines[0]}" = "service-a" ]
+  run curl -s http://localhost:8180/test/foo
+  [ "${lines[0]}" = "service-b" ]
+  run curl -s http://localhost:8180/test/path
+  [ "${lines[0]}" = "service-c" ]
+}