Fix digest authentication to use the correct URI

sdk/lib/io/http_impl.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.io;
 
 class _HttpIncoming extends Stream<List<int>> {
   final int _transferLength;
   final Completer _dataCompleter = new Completer();
   Stream<List<int>> _stream;
@@ skipping 896 matching lines @@
         (v) => _responseCompleter.complete(v),
         onError: (e) {
           _responseCompleter.completeError(e);
         });
   }
 
   void _onError(error) {
     _responseCompleter.completeError(error);
   }
 
+  // Generate the request URI based on the method and proxy.
+  String _requestUri() {
+    // Generate the request URI starting from the path component.
+    String uriStartingFromPath() {
+      String result = uri.path;
+      if (result.length == 0) result = "/";
+      if (uri.query != "") {
+        if (uri.fragment != "") {
+          result = "${result}?${uri.query}#${uri.fragment}";
+        } else {
+          result = "${result}?${uri.query}";
+        }
+      }
+      return result;
+    }
+
+    if (_proxy.isDirect) {
+      return uriStartingFromPath();
+    } else {
+      if (method == "CONNECT") {
+        // For the connect method the request URI is the host:port of
+        // the requested destination of the tunnel (see RFC 2817
+        // section 5.2)
+        return "${uri.domain}:${uri.port}";
+      } else {
+        if (_httpClientConnection._proxyTunnel) {
+          return uriStartingFromPath();
+        } else {
+          return uri.toString();
+        }
+      }
+    }
+  }
+
   void _writeHeader() {
     var buffer = new _BufferList();
 
     writeSP() => buffer.add(const [_CharCode.SP]);
 
     writeCRLF() => buffer.add(const [_CharCode.CR, _CharCode.LF]);
 
-    void writePath() {
-      String path = uri.path;
-      if (path.length == 0) path = "/";
-      if (uri.query != "") {
-        if (uri.fragment != "") {
-          path = "${path}?${uri.query}#${uri.fragment}";
-        } else {
-          path = "${path}?${uri.query}";
-        }
-      }
-      buffer.add(path.codeUnits);
-    }
-
     // Write the request method.
     buffer.add(method.codeUnits);
     writeSP();
     // Write the request URI.
-    if (_proxy.isDirect) {
-      writePath();
-    } else {
-      if (method == "CONNECT") {
-        // For the connect method the request URI is the host:port of
-        // the requested destination of the tunnel (see RFC 2817
-        // section 5.2)
-        buffer.add(uri.domain.codeUnits);
-        buffer.add(const [_CharCode.COLON]);
-        buffer.add(uri.port.toString().codeUnits);
-      } else {
-        if (_httpClientConnection._proxyTunnel) {
-          writePath();
-        } else {
-          buffer.add(uri.toString().codeUnits);
-        }
-      }
-    }
+    buffer.add(_requestUri().codeUnits);
     writeSP();
+    // Write HTTP/1.1.
     buffer.add(_Const.HTTP11);
     writeCRLF();
 
     // Add the cookies to the headers.
     if (!cookies.isEmpty) {
       StringBuffer sb = new StringBuffer();
       for (int i = 0; i < cookies.length; i++) {
         if (i > 0) sb.write("; ");
         sb.write(cookies[i].name);
         sb.write("=");
@@ skipping 1157 matching lines @@
 
 class _HttpClientDigestCredentials
     extends _HttpClientCredentials
     implements HttpClientDigestCredentials {
   _HttpClientDigestCredentials(this.username,
                                this.password);
 
   _AuthenticationScheme get scheme => _AuthenticationScheme.DIGEST;
 
   String authorization(_Credentials credentials, HttpClientRequest request) {
+    String requestUri = request._requestUri();
     MD5 hasher = new MD5();
     hasher.add(request.method.codeUnits);
     hasher.add([_CharCode.COLON]);
-    hasher.add(request.uri.path.codeUnits);
+    hasher.add(requestUri.codeUnits);
     var ha2 = CryptoUtils.bytesToHex(hasher.close());
 
     String qop;
     String cnonce;
     String nc;
     var x;
     hasher = new MD5();
     hasher.add(credentials.ha1.codeUnits);
     hasher.add([_CharCode.COLON]);
     if (credentials.qop == "auth") {
@@ skipping 16 matching lines @@
       hasher.add([_CharCode.COLON]);
       hasher.add(ha2.codeUnits);
     }
     var response = CryptoUtils.bytesToHex(hasher.close());
 
     StringBuffer buffer = new StringBuffer();
     buffer.write('Digest ');
     buffer.write('username="$username"');
     buffer.write(', realm="${credentials.realm}"');
     buffer.write(', nonce="${credentials.nonce}"');
-    buffer.write(', uri="${request.uri.path}"');
+    buffer.write(', uri="$requestUri"');
     buffer.write(', algorithm="${credentials.algorithm}"');
     if (qop == "auth") {
       buffer.write(', qop="$qop"');
       buffer.write(', cnonce="$cnonce"');
       buffer.write(', nc="$nc"');
     }
     buffer.write(', response="$response"');
     return buffer.toString();
   }
 
@@ skipping 13 matching lines @@
 
 
 class _RedirectInfo implements RedirectInfo {
   const _RedirectInfo(int this.statusCode,
                       String this.method,
                       Uri this.location);
   final int statusCode;
   final String method;
   final Uri location;
 }