From df4b23807e0721a1241b4240ea467762993f466a Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 26 Jun 2014 15:38:06 +0900 Subject: [PATCH] Renamed Params to Parameters --- websocket-sharp/AuthenticationChallenge.cs | 30 ++++---- websocket-sharp/AuthenticationResponse.cs | 81 +++++++++++----------- websocket-sharp/Ext.cs | 4 +- websocket-sharp/Net/HttpDigestIdentity.cs | 30 ++++---- 4 files changed, 72 insertions(+), 73 deletions(-) diff --git a/websocket-sharp/AuthenticationChallenge.cs b/websocket-sharp/AuthenticationChallenge.cs index 0a403a10..639060d6 100644 --- a/websocket-sharp/AuthenticationChallenge.cs +++ b/websocket-sharp/AuthenticationChallenge.cs @@ -36,26 +36,26 @@ namespace WebSocketSharp { #region Private Fields - private NameValueCollection _params; + private NameValueCollection _parameters; private string _scheme; #endregion #region Internal Constructors - internal AuthenticationChallenge (string authScheme, string authParams) + internal AuthenticationChallenge (string scheme, string parameters) { - _scheme = authScheme; - _params = authParams.ParseAuthParams (); + _scheme = scheme; + _parameters = parameters.ParseAuthParameters (); } #endregion #region Internal Properties - internal NameValueCollection Params { + internal NameValueCollection Parameters { get { - return _params; + return _parameters; } } @@ -65,37 +65,37 @@ namespace WebSocketSharp public string Algorithm { get { - return _params ["algorithm"]; + return _parameters ["algorithm"]; } } public string Domain { get { - return _params ["domain"]; + return _parameters ["domain"]; } } public string Nonce { get { - return _params ["nonce"]; + return _parameters ["nonce"]; } } public string Opaque { get { - return _params ["opaque"]; + return _parameters ["opaque"]; } } public string Qop { get { - return _params ["qop"]; + return _parameters ["qop"]; } } public string Realm { get { - return _params ["realm"]; + return _parameters ["realm"]; } } @@ -107,7 +107,7 @@ namespace WebSocketSharp public string Stale { get { - return _params ["stale"]; + return _parameters ["stale"]; } } @@ -118,8 +118,10 @@ namespace WebSocketSharp public static AuthenticationChallenge Parse (string value) { var challenge = value.Split (new [] { ' ' }, 2); - var scheme = challenge [0].ToLower (); + if (challenge.Length != 2) + return null; + var scheme = challenge [0].ToLower (); return scheme == "basic" || scheme == "digest" ? new AuthenticationChallenge (scheme, challenge [1]) : null; diff --git a/websocket-sharp/AuthenticationResponse.cs b/websocket-sharp/AuthenticationResponse.cs index b5238b91..c45c1115 100644 --- a/websocket-sharp/AuthenticationResponse.cs +++ b/websocket-sharp/AuthenticationResponse.cs @@ -39,17 +39,17 @@ namespace WebSocketSharp #region Private Fields private uint _nonceCount; - private NameValueCollection _params; + private NameValueCollection _parameters; private string _scheme; #endregion #region Private Constructors - private AuthenticationResponse (string authScheme, NameValueCollection authParams) + private AuthenticationResponse (string scheme, NameValueCollection parameters) { - _scheme = authScheme; - _params = authParams; + _scheme = scheme; + _parameters = parameters; } #endregion @@ -62,24 +62,19 @@ namespace WebSocketSharp } internal AuthenticationResponse ( - AuthenticationChallenge challenge, - NetworkCredential credentials, - uint nonceCount) - : this (challenge.Scheme, challenge.Params, credentials, nonceCount) + AuthenticationChallenge challenge, NetworkCredential credentials, uint nonceCount) + : this (challenge.Scheme, challenge.Parameters, credentials, nonceCount) { } internal AuthenticationResponse ( - string authScheme, - NameValueCollection authParams, - NetworkCredential credentials, - uint nonceCount) + string scheme, NameValueCollection parameters, NetworkCredential credentials, uint nonceCount) { - _scheme = authScheme.ToLower (); - _params = authParams; - _params ["username"] = credentials.UserName; - _params ["password"] = credentials.Password; - _params ["uri"] = credentials.Domain; + _scheme = scheme.ToLower (); + _parameters = parameters; + _parameters ["username"] = credentials.UserName; + _parameters ["password"] = credentials.Password; + _parameters ["uri"] = credentials.Domain; _nonceCount = nonceCount; if (_scheme == "digest") initAsDigest (); @@ -97,9 +92,9 @@ namespace WebSocketSharp } } - internal NameValueCollection Params { + internal NameValueCollection Parameters { get { - return _params; + return _parameters; } } @@ -109,55 +104,55 @@ namespace WebSocketSharp public string Algorithm { get { - return _params ["algorithm"]; + return _parameters ["algorithm"]; } } public string Cnonce { get { - return _params ["cnonce"]; + return _parameters ["cnonce"]; } } public string Nc { get { - return _params ["nc"]; + return _parameters ["nc"]; } } public string Nonce { get { - return _params ["nonce"]; + return _parameters ["nonce"]; } } public string Opaque { get { - return _params ["opaque"]; + return _parameters ["opaque"]; } } public string Password { get { - return _params ["password"]; + return _parameters ["password"]; } } public string Qop { get { - return _params ["qop"]; + return _parameters ["qop"]; } } public string Realm { get { - return _params ["realm"]; + return _parameters ["realm"]; } } public string Response { get { - return _params ["response"]; + return _parameters ["response"]; } } @@ -169,13 +164,13 @@ namespace WebSocketSharp public string Uri { get { - return _params ["uri"]; + return _parameters ["uri"]; } } public string UserName { get { - return _params ["username"]; + return _parameters ["username"]; } } @@ -185,20 +180,20 @@ namespace WebSocketSharp private void initAsDigest () { - var qops = _params ["qop"]; + var qops = _parameters ["qop"]; if (qops != null) { if (qops.Split (',').Contains (qop => qop.Trim ().ToLower () == "auth")) { - _params ["qop"] = "auth"; - _params ["nc"] = String.Format ("{0:x8}", ++_nonceCount); - _params ["cnonce"] = HttpUtility.CreateNonceValue (); + _parameters ["qop"] = "auth"; + _parameters ["nc"] = String.Format ("{0:x8}", ++_nonceCount); + _parameters ["cnonce"] = HttpUtility.CreateNonceValue (); } else { - _params ["qop"] = null; + _parameters ["qop"] = null; } } - _params ["method"] = "GET"; - _params ["response"] = HttpUtility.CreateRequestDigest (_params); + _parameters ["method"] = "GET"; + _parameters ["response"] = HttpUtility.CreateRequestDigest (_parameters); } #endregion @@ -216,7 +211,7 @@ namespace WebSocketSharp return scheme == "basic" ? new AuthenticationResponse (scheme, credentials [1].ParseBasicCredentials ()) : scheme == "digest" - ? new AuthenticationResponse (scheme, credentials [1].ParseAuthParams ()) + ? new AuthenticationResponse (scheme, credentials [1].ParseAuthParameters ()) : null; } catch { @@ -228,18 +223,20 @@ namespace WebSocketSharp public IIdentity ToIdentity () { return _scheme == "basic" - ? new HttpBasicIdentity (_params ["username"], _params ["password"]) as IIdentity + ? new HttpBasicIdentity ( + _parameters ["username"], _parameters ["password"]) as IIdentity : _scheme == "digest" - ? new HttpDigestIdentity (_params) + ? new HttpDigestIdentity (_parameters) : null; } public override string ToString () { return _scheme == "basic" - ? HttpUtility.CreateBasicAuthCredentials (_params ["username"], _params ["password"]) + ? HttpUtility.CreateBasicAuthCredentials ( + _parameters ["username"], _parameters ["password"]) : _scheme == "digest" - ? HttpUtility.CreateDigestAuthCredentials (_params) + ? HttpUtility.CreateDigestAuthCredentials (_parameters) : String.Empty; } diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index c66d0ae5..4400963c 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -571,7 +571,7 @@ namespace WebSocketSharp return true; } - internal static NameValueCollection ParseAuthParams (this string value) + internal static NameValueCollection ParseAuthParameters (this string value) { var res = new NameValueCollection (); foreach (var param in value.SplitHeaderValue (',')) { @@ -579,7 +579,7 @@ namespace WebSocketSharp var name = i > 0 ? param.Substring (0, i).Trim () : null; var val = i < 0 ? param.Trim ().Trim ('"') - : param.Length > i + 1 + : i < param.Length - 1 ? param.Substring (i + 1).Trim ().Trim ('"') : String.Empty; diff --git a/websocket-sharp/Net/HttpDigestIdentity.cs b/websocket-sharp/Net/HttpDigestIdentity.cs index 3914369d..5ad16cbd 100644 --- a/websocket-sharp/Net/HttpDigestIdentity.cs +++ b/websocket-sharp/Net/HttpDigestIdentity.cs @@ -39,16 +39,16 @@ namespace WebSocketSharp.Net { #region Private Fields - private NameValueCollection _params; + private NameValueCollection _parameters; #endregion #region Internal Constructors - internal HttpDigestIdentity (NameValueCollection authParams) - : base (authParams ["username"], "Digest") + internal HttpDigestIdentity (NameValueCollection parameters) + : base (parameters ["username"], "Digest") { - _params = authParams; + _parameters = parameters; } #endregion @@ -63,7 +63,7 @@ namespace WebSocketSharp.Net /// public string Algorithm { get { - return _params ["algorithm"]; + return _parameters ["algorithm"]; } } @@ -75,7 +75,7 @@ namespace WebSocketSharp.Net /// public string Cnonce { get { - return _params ["cnonce"]; + return _parameters ["cnonce"]; } } @@ -87,7 +87,7 @@ namespace WebSocketSharp.Net /// public string Nc { get { - return _params ["nc"]; + return _parameters ["nc"]; } } @@ -99,7 +99,7 @@ namespace WebSocketSharp.Net /// public string Nonce { get { - return _params ["nonce"]; + return _parameters ["nonce"]; } } @@ -111,7 +111,7 @@ namespace WebSocketSharp.Net /// public string Opaque { get { - return _params ["opaque"]; + return _parameters ["opaque"]; } } @@ -123,7 +123,7 @@ namespace WebSocketSharp.Net /// public string Qop { get { - return _params ["qop"]; + return _parameters ["qop"]; } } @@ -135,7 +135,7 @@ namespace WebSocketSharp.Net /// public string Realm { get { - return _params ["realm"]; + return _parameters ["realm"]; } } @@ -147,7 +147,7 @@ namespace WebSocketSharp.Net /// public string Response { get { - return _params ["response"]; + return _parameters ["response"]; } } @@ -159,7 +159,7 @@ namespace WebSocketSharp.Net /// public string Uri { get { - return _params ["uri"]; + return _parameters ["uri"]; } } @@ -169,13 +169,13 @@ namespace WebSocketSharp.Net internal bool IsValid (string password, string realm, string method, string entity) { - var parameters = new NameValueCollection (_params); + var parameters = new NameValueCollection (_parameters); parameters ["password"] = password; parameters ["realm"] = realm; parameters ["method"] = method; parameters ["entity"] = entity; - return _params ["response"] == HttpUtility.CreateRequestDigest (parameters); + return _parameters ["response"] == HttpUtility.CreateRequestDigest (parameters); } #endregion