1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
|
From 04245de5c480db5dff5983467f7a8606f1321ed6 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 24 Jul 2012 18:49:34 -0400
Subject: [PATCH] Fix for Novell bug #739119
---
.../System.Web.Util/SecureHashCodeProvider.cs | 131 ++++++++++++++++++++
mcs/class/System.Web/System.Web.dll.sources | 1 +
mcs/class/System.Web/System.Web/WebROCollection.cs | 5 +-
3 files changed, 136 insertions(+), 1 deletion(-)
create mode 100644 mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs
diff --git a/mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs b/mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs
new file mode 100644
index 0000000..165022c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs
@@ -0,0 +1,131 @@
+//
+// System.Collections.SecureHashCodeProvider.cs
+//
+// Authors:
+// Sergey Chaban (serge@wildwestsoftware.com)
+// Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+// Sebastien Pouliot <sebastien@ximian.com>
+//
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright 2012 Xamarin, Inc (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Collections;
+using System.Globalization;
+
+namespace System.Web.Util
+{
+ class SecureHashCodeProvider : IHashCodeProvider
+ {
+ static readonly SecureHashCodeProvider singletonInvariant = new SecureHashCodeProvider (CultureInfo.InvariantCulture);
+ static SecureHashCodeProvider singleton;
+ static readonly object sync = new object ();
+ static readonly int seed;
+
+ TextInfo m_text; // must match MS name for serialization
+
+ public static SecureHashCodeProvider Default {
+ get {
+ lock (sync) {
+ if (singleton == null) {
+ singleton = new SecureHashCodeProvider ();
+ } else if (singleton.m_text == null) {
+ if (!AreEqual (CultureInfo.CurrentCulture, CultureInfo.InvariantCulture))
+ singleton = new SecureHashCodeProvider ();
+ } else if (!AreEqual (singleton.m_text, CultureInfo.CurrentCulture)) {
+ singleton = new SecureHashCodeProvider ();
+ }
+ return singleton;
+ }
+ }
+ }
+
+ public static SecureHashCodeProvider DefaultInvariant {
+ get { return singletonInvariant; }
+ }
+
+ static SecureHashCodeProvider ()
+ {
+ // It should be enough to fend off the attack described in
+ // https://bugzilla.novell.com/show_bug.cgi?id=739119
+ // In order to predict value of the seed, the attacker would have to know the exact time when
+ // the server process started and since it's a remote attack, this is next to impossible.
+ // Using milliseconds instead of ticks here would make it easier for the attackers since there
+ // would only be as many as 1000 possible values
+ seed = (int)DateTime.UtcNow.Ticks;
+ }
+
+ // Public instance constructor
+ public SecureHashCodeProvider ()
+ {
+ CultureInfo culture = CultureInfo.CurrentCulture;
+ if (!AreEqual (culture, CultureInfo.InvariantCulture))
+ m_text = CultureInfo.CurrentCulture.TextInfo;
+ }
+
+ public SecureHashCodeProvider (CultureInfo culture)
+ {
+ if (culture == null)
+ throw new ArgumentNullException ("culture");
+ if (!AreEqual (culture, CultureInfo.InvariantCulture))
+ m_text = culture.TextInfo;
+ }
+
+ static bool AreEqual (CultureInfo a, CultureInfo b)
+ {
+ return a.LCID == b.LCID;
+ }
+
+ static bool AreEqual (TextInfo info, CultureInfo culture)
+ {
+ return info.LCID == culture.LCID;
+ }
+
+ public int GetHashCode (object obj)
+ {
+ if (obj == null)
+ throw new ArgumentNullException ("obj");
+
+ string str = obj as string;
+
+ if (str == null)
+ return obj.GetHashCode ();
+
+ int h = seed;
+ char c;
+
+ if ((m_text != null) && !AreEqual (m_text, CultureInfo.InvariantCulture)) {
+ str = m_text.ToLower (str);
+ for (int i = 0; i < str.Length; i++) {
+ c = str [i];
+ h = h * 31 + c;
+ }
+ } else {
+ for (int i = 0; i < str.Length; i++) {
+ c = Char.ToLower (str [i], CultureInfo.InvariantCulture);
+ h = h * 31 + c;
+ }
+ }
+ return h;
+ }
+ }
+}
diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index ca7745a..aa41fca 100644
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -1174,6 +1174,7 @@ System.Web.Util/IWebPropertyAccessor.cs
System.Web.Util/MachineKeySectionUtils.cs
System.Web.Util/RuntimeHelpers.cs
System.Web.Util/SearchPattern.cs
+System.Web.Util/SecureHashCodeProvider.cs
System.Web.Util/SerializationHelper.cs
System.Web.Util/StrUtils.cs
System.Web.Util/TimeUtil.cs
diff --git a/mcs/class/System.Web/System.Web/WebROCollection.cs b/mcs/class/System.Web/System.Web/WebROCollection.cs
index ddb2e30..e1b98df 100644
--- a/mcs/class/System.Web/System.Web/WebROCollection.cs
+++ b/mcs/class/System.Web/System.Web/WebROCollection.cs
@@ -5,6 +5,7 @@
// Gonzalo Paniagua Javier (gonzalo@novell.com)
//
// (c) 2005-2009 Novell, Inc. (http://www.novell.com)
+// Copyright 2012 Xamarin, Inc (http://xamarin.com)
//
//
// Permission is hereby granted, free of charge, to any person obtaining
@@ -26,8 +27,10 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System.Collections;
using System.Collections.Specialized;
using System.Text;
+using System.Web.Util;
namespace System.Web
{
@@ -36,7 +39,7 @@ class WebROCollection : NameValueCollection
bool got_id;
int id;
- public WebROCollection () : base (StringComparer.OrdinalIgnoreCase) { }
+ public WebROCollection () : base (SecureHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant) { }
public bool GotID {
get { return got_id; }
}
--
1.7.10
|
