Ignore:
Timestamp:
11/12/08 16:02:40 (12 years ago)
Author:
julian.reschke@…
Message:

Synchronize with trunk (../latest), with the exception of Part 6. Fix P7 where it pointed into a section that was removed from Part 6.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest-roy/p7-auth.xml

    r345 r437  
    1313  <!ENTITY SHOULD-NOT "<bcp14 xmlns='http://purl.org/net/xml2rfc/ext'>SHOULD NOT</bcp14>">
    1414  <!ENTITY ID-VERSION "latest">
    15   <!ENTITY ID-MONTH "November">
     15  <!ENTITY ID-MONTH "December">
    1616  <!ENTITY ID-YEAR "2008">
     17  <!ENTITY notation                     "<xref target='Part1' x:rel='#notation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1718  <!ENTITY notation-abnf                "<xref target='Part1' x:rel='#notation.abnf' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1819  <!ENTITY basic-rules                  "<xref target='Part1' x:rel='#basic.rules' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    19   <!ENTITY shared-and-non-shared-caches "<xref target='Part6' x:rel='#shared.and.non-shared.caches' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     20  <!ENTITY shared-and-non-shared-caches "<xref target='Part6' x:rel='#intro.terminology' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2021]>
    2122<?rfc toc="yes" ?>
     
    196197  </t>
    197198  <t>
    198     The changes in this draft are summarized in <xref target="changes.since.04"/>.
     199    The changes in this draft are summarized in <xref target="changes.since.05"/>.
    199200  </t>
    200201</note>
     
    238239</t>
    239240</section>
    240 </section>
    241 
    242 <section title="Notational Conventions and Generic Grammar" anchor="notation">
    243 <t>
    244   This specification uses the ABNF syntax defined in &notation-abnf;.
    245   <cref anchor="abnf.dep">ABNF syntax and basic rules will be adopted from RFC 5234, see
    246   <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>.</cref>
    247 </t>
    248 <t anchor="abnf.dependencies">
     241
     242<section title="Syntax Notation" anchor="notation">
     243  <x:anchor-alias value="ALPHA"/>
     244  <x:anchor-alias value="CR"/>
     245  <x:anchor-alias value="DIGIT"/>
     246  <x:anchor-alias value="LF"/>
     247  <x:anchor-alias value="OCTET"/>
     248  <x:anchor-alias value="VCHAR"/>
     249  <x:anchor-alias value="WSP"/>
     250<t>
     251  This specification uses the ABNF syntax defined in &notation;.
     252  The following core rules are included by
     253  reference, as defined in <xref target="RFC5234" x:fmt="," x:sec="B.1"/>:
     254  ALPHA (letters), CR (carriage return), CRLF (CR LF), CTL (controls),
     255  DIGIT (decimal 0-9), DQUOTE (double quote),
     256  HEXDIG (hexadecimal 0-9/A-F/a-f), LF (line feed),
     257  OCTET (any 8-bit sequence of data), SP (space),
     258  VCHAR (any visible USASCII character),
     259  and WSP (whitespace).
     260</t>
     261
     262<section title="Core Rules" anchor="core.rules">
     263  <x:anchor-alias value="OWS"/>
     264<t>
     265  The core rules below are defined in &basic-rules;:
     266</t>
     267<figure><artwork type="abnf2616">
     268  <x:ref>OWS</x:ref>         = &lt;OWS, defined in &basic-rules;&gt;
     269</artwork></figure>
     270</section>
     271
     272<section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
    249273  <x:anchor-alias value="challenge"/>
    250274  <x:anchor-alias value="credentials"/>
     275<t>
     276  <x:anchor-alias value="OWS"/>
    251277  The ABNF rules below are defined in other specifications:
    252278</t>
     
    255281  <x:ref>credentials</x:ref> = &lt;credentials, defined in <xref target="RFC2617" x:fmt="," x:sec="1.2"/>&gt;
    256282</artwork></figure>
     283</section>
     284
     285</section>
     286
    257287</section>
    258288
     
    304334  <iref primary="true" item="Headers" subitem="Authorization" x:for-anchor=""/>
    305335  <x:anchor-alias value="Authorization"/>
     336  <x:anchor-alias value="Authorization-v"/>
    306337<t>
    307338      A user agent that wishes to authenticate itself with a server--
    308339      usually, but not necessarily, after receiving a 401 response--does
    309340      so by including an Authorization request-header field with the
    310       request.  The Authorization field value consists of credentials
     341      request.  The field "Authorization" consists of credentials
    311342      containing the authentication information of the user agent for
    312343      the realm of the resource being requested.
    313344</t>
    314 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Authorization"/>
    315   <x:ref>Authorization</x:ref>  = "Authorization" ":" <x:ref>credentials</x:ref>
     345<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Authorization"/><iref primary="true" item="Grammar" subitem="Authorization-v"/>
     346  <x:ref>Authorization</x:ref>   = "Authorization" ":" <x:ref>OWS</x:ref> <x:ref>Authorization-v</x:ref>
     347  <x:ref>Authorization-v</x:ref> = <x:ref>credentials</x:ref>
    316348</artwork></figure>
    317349<t>
     
    359391  <iref primary="true" item="Headers" subitem="Proxy-Authenticate" x:for-anchor=""/>
    360392  <x:anchor-alias value="Proxy-Authenticate"/>
    361 <t>
    362    The Proxy-Authenticate response-header field &MUST; be included as part
     393  <x:anchor-alias value="Proxy-Authenticate-v"/>
     394<t>
     395   The response-header field "Proxy-Authenticate" &MUST; be included as part
    363396   of a 407 (Proxy Authentication Required) response. The field value
    364397   consists of a challenge that indicates the authentication scheme and
    365    parameters applicable to the proxy for this Request-URI.
    366 </t>
    367 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authenticate"/>
    368   <x:ref>Proxy-Authenticate</x:ref>  = "Proxy-Authenticate" ":" 1#<x:ref>challenge</x:ref>
     398   parameters applicable to the proxy for this request-target.
     399</t>
     400<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authenticate"/><iref primary="true" item="Grammar" subitem="Proxy-Authenticate-v"/>
     401  <x:ref>Proxy-Authenticate</x:ref>   = "Proxy-Authenticate" ":" <x:ref>OWS</x:ref>
     402                         <x:ref>Proxy-Authenticate-v</x:ref>
     403  <x:ref>Proxy-Authenticate-v</x:ref> = 1#<x:ref>challenge</x:ref>
    369404</artwork></figure>
    370405<t>
     
    384419  <iref primary="true" item="Headers" subitem="Proxy-Authorization" x:for-anchor=""/>
    385420  <x:anchor-alias value="Proxy-Authorization"/>
    386 <t>
    387    The Proxy-Authorization request-header field allows the client to
     421  <x:anchor-alias value="Proxy-Authorization-v"/>
     422<t>
     423   The request-header field "Proxy-Authorization" allows the client to
    388424   identify itself (or its user) to a proxy which requires
    389425   authentication. The Proxy-Authorization field value consists of
     
    391427   agent for the proxy and/or realm of the resource being requested.
    392428</t>
    393 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authorization"/>
    394   <x:ref>Proxy-Authorization</x:ref>     = "Proxy-Authorization" ":" <x:ref>credentials</x:ref>
     429<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authorization"/><iref primary="true" item="Grammar" subitem="Proxy-Authorization-v"/>
     430  <x:ref>Proxy-Authorization</x:ref>   = "Proxy-Authorization" ":" <x:ref>OWS</x:ref>
     431                          <x:ref>Proxy-Authorization-v</x:ref>
     432  <x:ref>Proxy-Authorization-v</x:ref> = <x:ref>credentials</x:ref>
    395433</artwork></figure>
    396434<t>
     
    412450  <iref primary="true" item="Headers" subitem="WWW-Authenticate" x:for-anchor=""/>
    413451  <x:anchor-alias value="WWW-Authenticate"/>
     452  <x:anchor-alias value="WWW-Authenticate-v"/>
    414453<t>
    415454   The WWW-Authenticate response-header field &MUST; be included in 401
    416455   (Unauthorized) response messages. The field value consists of at
    417456   least one challenge that indicates the authentication scheme(s) and
    418    parameters applicable to the Request-URI.
    419 </t>
    420 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="WWW-Authenticate"/>
    421   <x:ref>WWW-Authenticate</x:ref>  = "WWW-Authenticate" ":" 1#<x:ref>challenge</x:ref>
     457   parameters applicable to the request-target.
     458</t>
     459<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="WWW-Authenticate"/><iref primary="true" item="Grammar" subitem="WWW-Authenticate-v"/>
     460  <x:ref>WWW-Authenticate</x:ref>   = "WWW-Authenticate" ":" <x:ref>OWS</x:ref> <x:ref>WWW-Authenticate-v</x:ref>
     461  <x:ref>WWW-Authenticate-v</x:ref> = 1#<x:ref>challenge</x:ref>
    422462</artwork></figure>
    423463<t>
     
    668708</reference>
    669709
     710<reference anchor="RFC5234">
     711  <front>
     712    <title abbrev="ABNF for Syntax Specifications">Augmented BNF for Syntax Specifications: ABNF</title>
     713    <author initials="D." surname="Crocker" fullname="Dave Crocker" role="editor">
     714      <organization>Brandenburg InternetWorking</organization>
     715      <address>
     716      <postal>
     717      <street>675 Spruce Dr.</street>
     718      <city>Sunnyvale</city>
     719      <region>CA</region>
     720      <code>94086</code>
     721      <country>US</country></postal>
     722      <phone>+1.408.246.8253</phone>
     723      <email>dcrocker@bbiw.net</email></address> 
     724    </author>
     725    <author initials="P." surname="Overell" fullname="Paul Overell">
     726      <organization>THUS plc.</organization>
     727      <address>
     728      <postal>
     729      <street>1/2 Berkeley Square</street>
     730      <street>99 Berkely Street</street>
     731      <city>Glasgow</city>
     732      <code>G3 7HR</code>
     733      <country>UK</country></postal>
     734      <email>paul.overell@thus.net</email></address>
     735    </author>
     736    <date month="January" year="2008"/>
     737  </front>
     738  <seriesInfo name="STD" value="68"/>
     739  <seriesInfo name="RFC" value="5234"/>
     740</reference>
     741
    670742</references>
    671743
     
    738810
    739811</section>
     812
     813<section xmlns:x="http://purl.org/net/xml2rfc/ext" title="Collected ABNF" anchor="collected.abnf">
     814<figure>
     815<artwork type="abnf" name="p7-auth.parsed-abnf">
     816<x:ref>Authorization</x:ref> = "Authorization:" OWS Authorization-v
     817<x:ref>Authorization-v</x:ref> = credentials
     818
     819<x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
     820
     821<x:ref>Proxy-Authenticate</x:ref> = "Proxy-Authenticate:" OWS Proxy-Authenticate-v
     822<x:ref>Proxy-Authenticate-v</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS
     823 challenge ] )
     824<x:ref>Proxy-Authorization</x:ref> = "Proxy-Authorization:" OWS
     825 Proxy-Authorization-v
     826<x:ref>Proxy-Authorization-v</x:ref> = credentials
     827
     828<x:ref>WWW-Authenticate</x:ref> = "WWW-Authenticate:" OWS WWW-Authenticate-v
     829<x:ref>WWW-Authenticate-v</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS
     830 challenge ] )
     831
     832<x:ref>challenge</x:ref> = &lt;challenge, defined in [RFC2617], Section 1.2&gt;
     833<x:ref>credentials</x:ref> = &lt;credentials, defined in [RFC2617], Section 1.2&gt;
     834
     835; Authorization defined but not used
     836; Proxy-Authenticate defined but not used
     837; Proxy-Authorization defined but not used
     838; WWW-Authenticate defined but not used
     839
     840
     841</artwork>
     842</figure>
     843</section>
     844
    740845
    741846<section title="Change Log (to be removed by RFC Editor before publication)"  anchor="change.log">
     
    792897<section title="Since draft-ietf-httpbis-p7-auth-04" anchor="changes.since.04">
    793898<t>
     899  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
     900  <list style="symbols">
     901    <t>
     902      Use "/" instead of "|" for alternatives.
     903    </t>
     904    <t>
     905      Introduce new ABNF rules for "bad" whitespace ("BWS"), optional
     906      whitespace ("OWS") and required whitespace ("RWS").
     907    </t>
     908    <t>
     909      Rewrite ABNFs to spell out whitespace rules, factor out
     910      header value format definitions.
     911    </t>
     912  </list>
     913</t>
     914</section>
     915
     916<section title="Since draft-ietf-httpbis-p7-auth-05" anchor="changes.since.05">
     917<t>
     918  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
     919  <list style="symbols">
     920    <t>
     921      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
     922    </t>
     923  </list>
    794924</t>
    795925</section>
Note: See TracChangeset for help on using the changeset viewer.