DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed ParseBasicAuthResponseParams to ParseBasicCredentials

Browse Source
This commit is contained in:
sta 2014-06-25 10:31:15 +09:00
parent 1a05d22f31
commit 2b42af79c0
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
websocket-sharp/AuthenticationResponse.cs
View File

@ -214,8 +214,7 @@ namespace WebSocketSharp
var scheme = credentials [0].ToLower ();
return scheme == "basic"
? new AuthenticationResponse (
scheme, credentials [1].ParseBasicAuthResponseParams ())
? new AuthenticationResponse (scheme, credentials [1].ParseBasicCredentials ())
: scheme == "digest"
? new AuthenticationResponse (scheme, credentials [1].ParseAuthParams ())
: null;

64
websocket-sharp/Ext.cs
View File

@ -6,7 +6,7 @@
* - GetStatusDescription is derived from System.Net.HttpListenerResponse.cs
* - IsPredefinedScheme is derived from System.Uri.cs
* - MaybeUri is derived from System.Uri.cs
* - ParseBasicAuthResponseParams is derived from System.Net.HttpListenerContext.cs
* - ParseBasicCredentials is derived from System.Net.HttpListenerContext.cs
*
* The MIT License
*
@ -571,39 +571,6 @@ namespace WebSocketSharp
return true;
}
internal static string Quote (this string value)
{
return value.IsToken ()
? value
: String.Format ("\"{0}\"", value.Replace ("\"", "\\\""));
}
internal static NameValueCollection ParseBasicAuthResponseParams (this string value)
{
// HTTP Basic Authentication response is a formatted Base64 string.
var userPass = Encoding.Default.GetString (
Convert.FromBase64String (value));
// The format is [<domain>\]<username>:<password>.
// 'domain' is optional.
var i = userPass.IndexOf (':');
var username = userPass.Substring (0, i);
var password = i < userPass.Length - 1
? userPass.Substring (i + 1)
: String.Empty;
// Check if 'domain' exists.
i = username.IndexOf ('\\');
if (i > 0)
username = username.Substring (i + 1);
var result = new NameValueCollection ();
result ["username"] = username;
result ["password"] = password;
return result;
}
internal static NameValueCollection ParseAuthParams (this string value)
{
var res = new NameValueCollection ();
@ -622,6 +589,35 @@ namespace WebSocketSharp
return res;
}
internal static NameValueCollection ParseBasicCredentials (this string value)
{
// Decode the basic-credentials (a Base64 encoded string).
var cred = Encoding.Default.GetString (Convert.FromBase64String (value));
// The format is [<domain>\]<username>:<password>.
var i = cred.IndexOf (':');
var user = cred.Substring (0, i);
var pass = i < cred.Length - 1 ? cred.Substring (i + 1) : String.Empty;
// Check if 'domain' exists.
i = user.IndexOf ('\\');
if (i > -1)
user = user.Substring (i + 1);
var res = new NameValueCollection ();
res ["username"] = user;
res ["password"] = pass;
return res;
}
internal static string Quote (this string value)
{
return value.IsToken ()
? value
: String.Format ("\"{0}\"", value.Replace ("\"", "\\\""));
}
internal static byte [] ReadBytes (this Stream stream, int length)
{
return stream.readBytes (new byte [length], 0, length);