Use a single-string URLPattern for dictionaries

draft-ietf-httpbis-compression-dictionary.md

@@ -81,39 +81,39 @@ be used as a dictionary for future requests for URLs that match the rules
 specified in the Use-As-Dictionary response header.
 
 The Use-As-Dictionary response header is a Structured Field
-{{STRUCTURED-FIELDS}} sf-dictionary with values for "match", "match-search",
-"match-dest", "ttl", "id", and "type".
+{{STRUCTURED-FIELDS}} sf-dictionary with values for "match", "match-dest",
+"ttl", "id", and "type".
 
 ### match
 
 The "match" value of the Use-As-Dictionary header is a sf-string value
-that provides the "pathname" of a URLPattern
-(https://urlpattern.spec.whatwg.org/#dom-urlpatterninit-pathname).
-
-The "match" is a {{URL}} path relative to the full request URL of the
-dictionary.  The request URL for the dictionary itself is used as the "baseURL"
-for constructing the URLPattern (https://urlpattern.spec.whatwg.org/) that
-is used for matching the dictionary to relevant requests when running
-{{dictionary-url-matching}}.
-
-The URLPattern used for request matching does not support regular expressions
-(https://urlpattern.spec.whatwg.org/#token-type-regexp) in the "match".
+that provides the URLPattern to use for request matching
+(https://urlpattern.spec.whatwg.org/).
+
+The URLPattern used for matching has some restrictions:
+* Regular expressions are not supported
+(https://urlpattern.spec.whatwg.org/#token-type-regexp).
+* The match pattern MUST be for the same {{Origin}} as the dictionary.
+
+The following algorithm will return TRUE for a valid match pattern and FALSE
+for an invalid pattern that MUST NOT be used:
+
+1. Let MATCH be the value of "match" for the given dictionary.
+1. Let URL be the URL of the dictionary request.
+1. Let PATTERN be a URLPattern constructed by setting input=MATCH,
+and baseURL=BASEURL (https://urlpattern.spec.whatwg.org/).
+1. If PATTERN parsed a regexp token then return FALSE
+(https://urlpattern.spec.whatwg.org/#token-type-regexp).
+1. If the "hash" attribute of PATTERN is a non-empty string then return FALSE.
+1. Let SRC be a URLPattern constructed by setting input=BASEURL.
+1. If any of the "protocol", "username", "password", "hostname", or "port"
+attributes of PATTERN do not match the value of the same attribute in SRC then
+return FALSE.
+1. Return True.
 
 The "match" value is required and MUST be included in the
 Use-As-Dictionary sf-dictionary for the dictionary to be considered valid.
 
-### match-search
-
-The "match-search" value of the Use-As-Dictionary header is a sf-string value
-that provides the "search" of a URLPattern
-(https://urlpattern.spec.whatwg.org/#dom-urlpatterninit-search).
-
-The "match-search" is the match pattern for the searchpart of the request
-{{URL}} and does not support regular expressions.
-
-The "match-search" value is optional and defaults to the asterisk wildcard
-token "*".
-
 ### match-dest
 
 The "match-dest" value of the Use-As-Dictionary header is a sf-string value
@@ -235,8 +235,8 @@ of the dictionary, it MUST be ignored.
 ### Dictionary URL matching
 
 When a dictionary is stored as a result of a "Use-As-Dictionary" directive, it
-includes "match", "match-search" and "match-dest" strings that are used to
-match an outgoing request from a client to the available dictionaries.
+includes "match" and "match-dest" strings that are used to match an outgoing
+request from a client to the available dictionaries.
 
 To see if an outbound request matches a given dictionary, the following
 algorithm will return TRUE for a successful match and FALSE for no-match:
@@ -247,14 +247,13 @@ algorithm will return TRUE for a successful match and FALSE for no-match:
     request.
     * If DEST is not an empty string and If DEST and REQUEST_DEST are not the
     same value, return FALSE
-1. Let PATH be the value of "match" for the given dictionary.
-1. Let SEARCH be the value of "match-search" for the given dictionary.
-1. Let BASEURL be the request URL of the given dictionary.
-1. Let PATTERN be a URLPattern constructed by setting pathname=PATH,
-search=SEARCH, baseURL=BASEURL (https://urlpattern.spec.whatwg.org/).
+1. Let MATCH be the value of "match" for the given dictionary.
+1. Let BASEURL be the URL of the dictionary request.
+1. Let PATTERN be a URLPattern constructed by setting input=MATCH,
+and baseURL=BASEURL (https://urlpattern.spec.whatwg.org/).
 1. LET URL represent the request URL being checked.
-1. Return the result of running the URLPattern "match" algorithm
-(https://urlpattern.spec.whatwg.org/#match)
+1. Return the result of running the "test" method of PATTERN with input=URL
+(https://urlpattern.spec.whatwg.org/#ref-for-dom-urlpattern-test)
 
 ### Multiple matching dictionaries
 
@@ -265,8 +264,6 @@ and matches a "match-dest" takes precedence over a match that does not use a
 destination.
 1. Given equivalent destination precedence, the dictionary with the longest
 "match" takes precedence.
-1. Given equivalent destination and path precedence, the dictionary with the
-longest "match-search" takes precedence.
 1. Given equivalent destination, path and search precedence, the most recently
 fetched dictionary takes precedence.