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

Refactored Cookie.cs

Browse Source
This commit is contained in:
sta 2014-08-13 22:54:31 +09:00
parent 0a742f2e91
commit c8bd8e9522
1 changed files with 77 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
websocket-sharp/Net/Cookie.cs
View File

@ -63,13 +63,6 @@ namespace WebSocketSharp.Net
[Serializable] [Serializable]
public sealed class Cookie public sealed class Cookie
{ {
#region Private Static Fields
private static char [] _reservedCharsForName = { ' ', '=', ';', ',', '\n', '\r', '\t' };
private static char [] _reservedCharsForValue = { ';', ',' };
#endregion
#region Private Fields #region Private Fields
private string _comment; private string _comment;
@ -82,6 +75,8 @@ namespace WebSocketSharp.Net
private string _path; private string _path;
private string _port; private string _port;
private int[] _ports; private int[] _ports;
private static readonly char[] _reservedCharsForName;
private static readonly char[] _reservedCharsForValue;
private bool _secure; private bool _secure;
private DateTime _timestamp; private DateTime _timestamp;
private string _value; private string _value;
@ -89,6 +84,16 @@ namespace WebSocketSharp.Net
#endregion #endregion
#region Static Constructor
static Cookie ()
{
_reservedCharsForName = new[] { ' ', '=', ';', ',', '\n', '\r', '\t' };
_reservedCharsForValue = new[] { ';', ',' };
}
#endregion
#region Public Constructors #region Public Constructors
/// <summary> /// <summary>
@ -471,13 +476,13 @@ namespace WebSocketSharp.Net
if (!value.IsEnclosedIn ('"')) if (!value.IsEnclosedIn ('"'))
throw new CookieException ( throw new CookieException (
"The value of Port attribute must be enclosed in double quotes."); "The value specified for the Port attribute isn't enclosed in double quotes.");
string error; string err;
if (!tryCreatePorts (value, out _ports, out error)) if (!tryCreatePorts (value, out _ports, out err))
throw new CookieException ( throw new CookieException (
String.Format ( String.Format (
"The value specified for a Port attribute contains an invalid value: {0}", error)); "The value specified for the Port attribute contains an invalid value: {0}", err));
_port = value; _port = value;
} }
@ -565,7 +570,7 @@ namespace WebSocketSharp.Net
set { set {
if (value < 0 || value > 1) if (value < 0 || value > 1)
throw new ArgumentOutOfRangeException ("value", "Must be 0 or 1."); throw new ArgumentOutOfRangeException ("value", "Not 0 or 1.");
_version = value; _version = value;
} }
@ -578,12 +583,12 @@ namespace WebSocketSharp.Net
private static bool canSetName (string name, out string message) private static bool canSetName (string name, out string message)
{ {
if (name.IsNullOrEmpty ()) { if (name.IsNullOrEmpty ()) {
message = "Name must not be null or empty."; message = "The value specified for the Name is null or empty.";
return false; return false;
} }
if (name[0] == '$' || name.Contains (_reservedCharsForName)) { if (name[0] == '$' || name.Contains (_reservedCharsForName)) {
message = "The value specified for a Name contains an invalid character."; message = "The value specified for the Name contains an invalid character.";
return false; return false;
} }
@ -594,12 +599,12 @@ namespace WebSocketSharp.Net
private static bool canSetValue (string value, out string message) private static bool canSetValue (string value, out string message)
{ {
if (value == null) { if (value == null) {
message = "Value must not be null."; message = "The value specified for the Value is null.";
return false; return false;
} }
if (value.Contains (_reservedCharsForValue) && !value.IsEnclosedIn ('"')) { if (value.Contains (_reservedCharsForValue) && !value.IsEnclosedIn ('"')) {
message = "The value specified for a Value contains an invalid character."; message = "The value specified for the Value contains an invalid character.";
return false; return false;
} }
@ -618,80 +623,82 @@ namespace WebSocketSharp.Net
private string toResponseStringVersion0 () private string toResponseStringVersion0 ()
{ {
var result = new StringBuilder (64); var output = new StringBuilder (64);
result.AppendFormat ("{0}={1}", _name, _value); output.AppendFormat ("{0}={1}", _name, _value);
if (_expires != DateTime.MinValue) if (_expires != DateTime.MinValue)
result.AppendFormat ( output.AppendFormat (
"; Expires={0}", "; Expires={0}",
_expires.ToUniversalTime ().ToString ( _expires.ToUniversalTime ().ToString (
"ddd, dd'-'MMM'-'yyyy HH':'mm':'ss 'GMT'", "ddd, dd'-'MMM'-'yyyy HH':'mm':'ss 'GMT'",
CultureInfo.CreateSpecificCulture ("en-US"))); CultureInfo.CreateSpecificCulture ("en-US")));
if (!_path.IsNullOrEmpty ()) if (!_path.IsNullOrEmpty ())
result.AppendFormat ("; Path={0}", _path); output.AppendFormat ("; Path={0}", _path);
if (!_domain.IsNullOrEmpty ()) if (!_domain.IsNullOrEmpty ())
result.AppendFormat ("; Domain={0}", _domain); output.AppendFormat ("; Domain={0}", _domain);
if (_secure) if (_secure)
result.Append ("; Secure"); output.Append ("; Secure");
if (_httpOnly) if (_httpOnly)
result.Append ("; HttpOnly"); output.Append ("; HttpOnly");
return result.ToString (); return output.ToString ();
} }
private string toResponseStringVersion1 () private string toResponseStringVersion1 ()
{ {
var result = new StringBuilder (64); var output = new StringBuilder (64);
result.AppendFormat ("{0}={1}; Version={2}", _name, _value, _version); output.AppendFormat ("{0}={1}; Version={2}", _name, _value, _version);
if (_expires != DateTime.MinValue) if (_expires != DateTime.MinValue)
result.AppendFormat ("; Max-Age={0}", MaxAge); output.AppendFormat ("; Max-Age={0}", MaxAge);
if (!_path.IsNullOrEmpty ()) if (!_path.IsNullOrEmpty ())
result.AppendFormat ("; Path={0}", _path); output.AppendFormat ("; Path={0}", _path);
if (!_domain.IsNullOrEmpty ()) if (!_domain.IsNullOrEmpty ())
result.AppendFormat ("; Domain={0}", _domain); output.AppendFormat ("; Domain={0}", _domain);
if (!_port.IsNullOrEmpty ()) { if (!_port.IsNullOrEmpty ()) {
if (_port == "\"\"") if (_port == "\"\"")
result.Append ("; Port"); output.Append ("; Port");
else else
result.AppendFormat ("; Port={0}", _port); output.AppendFormat ("; Port={0}", _port);
} }
if (!_comment.IsNullOrEmpty ()) if (!_comment.IsNullOrEmpty ())
result.AppendFormat ("; Comment={0}", _comment.UrlEncode ()); output.AppendFormat ("; Comment={0}", _comment.UrlEncode ());
if (_commentUri != null) { if (_commentUri != null) {
var url = _commentUri.OriginalString; var url = _commentUri.OriginalString;
result.AppendFormat ("; CommentURL={0}", url.IsToken () ? url : url.Quote ()); output.AppendFormat ("; CommentURL={0}", url.IsToken () ? url : url.Quote ());
} }
if (_discard) if (_discard)
result.Append ("; Discard"); output.Append ("; Discard");
if (_secure) if (_secure)
result.Append ("; Secure"); output.Append ("; Secure");
return result.ToString (); return output.ToString ();
} }
private static bool tryCreatePorts (string value, out int[] result, out string parseError) private static bool tryCreatePorts (string value, out int[] result, out string parseError)
{ {
var ports = value.Trim ('"').Split (','); var ports = value.Trim ('"').Split (',');
var tmp = new int [ports.Length]; var len = ports.Length;
for (int i = 0; i < ports.Length; i++) { var res = new int[len];
tmp [i] = int.MinValue; for (var i = 0; i < len; i++) {
res[i] = Int32.MinValue;
var port = ports[i].Trim (); var port = ports[i].Trim ();
if (port.Length == 0) if (port.Length == 0)
continue; continue;
if (!int.TryParse (port, out tmp [i])) { if (!Int32.TryParse (port, out res[i])) {
result = new int[0]; result = new int[0];
parseError = port; parseError = port;
@ -699,7 +706,7 @@ namespace WebSocketSharp.Net
} }
} }
result = tmp; result = res;
parseError = String.Empty; parseError = String.Empty;
return true; return true;
@ -718,28 +725,28 @@ namespace WebSocketSharp.Net
if (_version == 0) if (_version == 0)
return String.Format ("{0}={1}", _name, _value); return String.Format ("{0}={1}", _name, _value);
var result = new StringBuilder (64); var output = new StringBuilder (64);
result.AppendFormat ("$Version={0}; {1}={2}", _version, _name, _value); output.AppendFormat ("$Version={0}; {1}={2}", _version, _name, _value);
if (!_path.IsNullOrEmpty ()) if (!_path.IsNullOrEmpty ())
result.AppendFormat ("; $Path={0}", _path); output.AppendFormat ("; $Path={0}", _path);
else if (uri != null) else if (uri != null)
result.AppendFormat ("; $Path={0}", uri.GetAbsolutePath ()); output.AppendFormat ("; $Path={0}", uri.GetAbsolutePath ());
else else
result.Append ("; $Path=/"); output.Append ("; $Path=/");
bool appendDomain = uri == null || uri.Host != _domain; var appendDomain = uri == null || uri.Host != _domain;
if (appendDomain && !_domain.IsNullOrEmpty ()) if (appendDomain && !_domain.IsNullOrEmpty ())
result.AppendFormat ("; $Domain={0}", _domain); output.AppendFormat ("; $Domain={0}", _domain);
if (!_port.IsNullOrEmpty ()) { if (!_port.IsNullOrEmpty ()) {
if (_port == "\"\"") if (_port == "\"\"")
result.Append ("; $Port"); output.Append ("; $Port");
else else
result.AppendFormat ("; $Port={0}", _port); output.AppendFormat ("; $Port={0}", _port);
} }
return result.ToString (); return output.ToString ();
} }
// From server to client // From server to client