diff options
Diffstat (limited to 'OpenSim/Framework/Serialization/External/OspResolver.cs')
-rw-r--r-- | OpenSim/Framework/Serialization/External/OspResolver.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Framework/Serialization/External/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs index fa7160f..a1e9d55 100644 --- a/OpenSim/Framework/Serialization/External/OspResolver.cs +++ b/OpenSim/Framework/Serialization/External/OspResolver.cs | |||
@@ -35,13 +35,13 @@ using OpenSim.Services.Interfaces; | |||
35 | namespace OpenSim.Framework.Serialization | 35 | namespace OpenSim.Framework.Serialization |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Resolves OpenSim Profile Anchors (OSPA). An OSPA is a string used to provide information for | 38 | /// Resolves OpenSim Profile Anchors (OSPA). An OSPA is a string used to provide information for |
39 | /// identifying user profiles or supplying a simple name if no profile is available. | 39 | /// identifying user profiles or supplying a simple name if no profile is available. |
40 | /// </summary> | 40 | /// </summary> |
41 | public class OspResolver | 41 | public class OspResolver |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | public const string OSPA_PREFIX = "ospa:"; | 45 | public const string OSPA_PREFIX = "ospa:"; |
46 | public const string OSPA_NAME_KEY = "n"; | 46 | public const string OSPA_NAME_KEY = "n"; |
47 | public const string OSPA_NAME_VALUE_SEPARATOR = " "; | 47 | public const string OSPA_NAME_VALUE_SEPARATOR = " "; |
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Serialization | |||
76 | 76 | ||
77 | return null; | 77 | return null; |
78 | } | 78 | } |
79 | 79 | ||
80 | /// <summary> | 80 | /// <summary> |
81 | /// Make an OSPA given a user name | 81 | /// Make an OSPA given a user name |
82 | /// </summary> | 82 | /// </summary> |
@@ -89,17 +89,17 @@ namespace OpenSim.Framework.Serialization | |||
89 | 89 | ||
90 | // m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName); | 90 | // m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName); |
91 | // System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName); | 91 | // System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName); |
92 | 92 | ||
93 | return ospa; | 93 | return ospa; |
94 | } | 94 | } |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
97 | /// Resolve an osp string into the most suitable internal OpenSim identifier. | 97 | /// Resolve an osp string into the most suitable internal OpenSim identifier. |
98 | /// </summary> | 98 | /// </summary> |
99 | /// | 99 | /// |
100 | /// In some cases this will be a UUID if a suitable profile exists on the system. In other cases, this may | 100 | /// In some cases this will be a UUID if a suitable profile exists on the system. In other cases, this may |
101 | /// just return the same identifier after creating a temporary profile. | 101 | /// just return the same identifier after creating a temporary profile. |
102 | /// | 102 | /// |
103 | /// <param name="ospa"></param> | 103 | /// <param name="ospa"></param> |
104 | /// <param name="commsManager"></param> | 104 | /// <param name="commsManager"></param> |
105 | /// <returns> | 105 | /// <returns> |
@@ -111,14 +111,14 @@ namespace OpenSim.Framework.Serialization | |||
111 | if (!ospa.StartsWith(OSPA_PREFIX)) | 111 | if (!ospa.StartsWith(OSPA_PREFIX)) |
112 | { | 112 | { |
113 | // m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa); | 113 | // m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa); |
114 | return UUID.Zero; | 114 | return UUID.Zero; |
115 | } | 115 | } |
116 | 116 | ||
117 | // m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa); | 117 | // m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa); |
118 | 118 | ||
119 | string ospaMeat = ospa.Substring(OSPA_PREFIX.Length); | 119 | string ospaMeat = ospa.Substring(OSPA_PREFIX.Length); |
120 | string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY); | 120 | string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY); |
121 | 121 | ||
122 | foreach (string tuple in ospaTuples) | 122 | foreach (string tuple in ospaTuples) |
123 | { | 123 | { |
124 | int tupleSeparatorIndex = tuple.IndexOf(OSPA_PAIR_SEPARATOR); | 124 | int tupleSeparatorIndex = tuple.IndexOf(OSPA_PAIR_SEPARATOR); |
@@ -128,17 +128,17 @@ namespace OpenSim.Framework.Serialization | |||
128 | m_log.WarnFormat("[OSP RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa); | 128 | m_log.WarnFormat("[OSP RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa); |
129 | continue; | 129 | continue; |
130 | } | 130 | } |
131 | 131 | ||
132 | string key = tuple.Remove(tupleSeparatorIndex).Trim(); | 132 | string key = tuple.Remove(tupleSeparatorIndex).Trim(); |
133 | string value = tuple.Substring(tupleSeparatorIndex + 1).Trim(); | 133 | string value = tuple.Substring(tupleSeparatorIndex + 1).Trim(); |
134 | 134 | ||
135 | if (OSPA_NAME_KEY == key) | 135 | if (OSPA_NAME_KEY == key) |
136 | return ResolveOspaName(value, userService); | 136 | return ResolveOspaName(value, userService); |
137 | } | 137 | } |
138 | 138 | ||
139 | return UUID.Zero; | 139 | return UUID.Zero; |
140 | } | 140 | } |
141 | 141 | ||
142 | /// <summary> | 142 | /// <summary> |
143 | /// Hash a profile name into a UUID | 143 | /// Hash a profile name into a UUID |
144 | /// </summary> | 144 | /// </summary> |
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Serialization | |||
148 | { | 148 | { |
149 | return new UUID(Utils.MD5(Encoding.Unicode.GetBytes(name)), 0); | 149 | return new UUID(Utils.MD5(Encoding.Unicode.GetBytes(name)), 0); |
150 | } | 150 | } |
151 | 151 | ||
152 | /// <summary> | 152 | /// <summary> |
153 | /// Resolve an OSPI name by querying existing persistent user profiles. If there is no persistent user profile | 153 | /// Resolve an OSPI name by querying existing persistent user profiles. If there is no persistent user profile |
154 | /// then a temporary user profile is inserted in the cache. | 154 | /// then a temporary user profile is inserted in the cache. |
@@ -164,13 +164,13 @@ namespace OpenSim.Framework.Serialization | |||
164 | return UUID.Zero; | 164 | return UUID.Zero; |
165 | 165 | ||
166 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); | 166 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); |
167 | 167 | ||
168 | if (nameSeparatorIndex < 0) | 168 | if (nameSeparatorIndex < 0) |
169 | { | 169 | { |
170 | m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name); | 170 | m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name); |
171 | return UUID.Zero; | 171 | return UUID.Zero; |
172 | } | 172 | } |
173 | 173 | ||
174 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); | 174 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); |
175 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); | 175 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); |
176 | 176 | ||
@@ -178,14 +178,14 @@ namespace OpenSim.Framework.Serialization | |||
178 | if (account != null) | 178 | if (account != null) |
179 | { | 179 | { |
180 | // m_log.DebugFormat( | 180 | // m_log.DebugFormat( |
181 | // "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}", | 181 | // "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}", |
182 | // account.PrincipalID, firstName, lastName); | 182 | // account.PrincipalID, firstName, lastName); |
183 | 183 | ||
184 | return account.PrincipalID; | 184 | return account.PrincipalID; |
185 | } | 185 | } |
186 | // else | 186 | // else |
187 | // { | 187 | // { |
188 | // m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name); | 188 | // m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name); |
189 | // } | 189 | // } |
190 | 190 | ||
191 | // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc | 191 | // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc |
@@ -194,11 +194,11 @@ namespace OpenSim.Framework.Serialization | |||
194 | tempUserProfile.FirstName = firstName; | 194 | tempUserProfile.FirstName = firstName; |
195 | tempUserProfile.SurName = lastName; | 195 | tempUserProfile.SurName = lastName; |
196 | tempUserProfile.ID = HashName(tempUserProfile.Name); | 196 | tempUserProfile.ID = HashName(tempUserProfile.Name); |
197 | 197 | ||
198 | m_log.DebugFormat( | 198 | m_log.DebugFormat( |
199 | "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID); | 199 | "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID); |
200 | commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); | 200 | commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); |
201 | 201 | ||
202 | return tempUserProfile.ID; | 202 | return tempUserProfile.ID; |
203 | */ | 203 | */ |
204 | 204 | ||