diff options
author | Mic Bowman | 2013-07-31 11:27:35 -0700 |
---|---|---|
committer | Mic Bowman | 2013-07-31 11:27:35 -0700 |
commit | 64f2dc778ad7a080ba89a1077da538c011c7c934 (patch) | |
tree | 963b456d229b7b986b8f8a6ce251e52774de474d /OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |
parent | Avoid another null ref opportunity. (diff) | |
download | opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.zip opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.gz opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.bz2 opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.xz |
A pretty major restructuring of the simian method invocations in order to
service access capabilities. In conjunction with the corresponding Simian
updates, this enables explicit per-simulator capability-based access to
grid services. That enables grid owners to add or revoke access to the grid
on a simulator by simulator basis.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 6603f6e..3bd11d9 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
110 | { "UserID", principalID.ToString() } | 110 | { "UserID", principalID.ToString() } |
111 | }; | 111 | }; |
112 | 112 | ||
113 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 113 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
114 | if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) | 114 | if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) |
115 | { | 115 | { |
116 | bool md5hashFound = false; | 116 | bool md5hashFound = false; |
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
153 | { "SessionID", token } | 153 | { "SessionID", token } |
154 | }; | 154 | }; |
155 | 155 | ||
156 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 156 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
157 | if (response["Success"].AsBoolean()) | 157 | if (response["Success"].AsBoolean()) |
158 | { | 158 | { |
159 | return true; | 159 | return true; |
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
175 | { "UserID", principalID.ToString() } | 175 | { "UserID", principalID.ToString() } |
176 | }; | 176 | }; |
177 | 177 | ||
178 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 178 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
179 | if (response["Success"].AsBoolean()) | 179 | if (response["Success"].AsBoolean()) |
180 | { | 180 | { |
181 | return true; | 181 | return true; |
@@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
198 | { "UserID", principalID.ToString() } | 198 | { "UserID", principalID.ToString() } |
199 | }; | 199 | }; |
200 | 200 | ||
201 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 201 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
202 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) | 202 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) |
203 | { | 203 | { |
204 | OSDMap userMap = (OSDMap)response["User"]; | 204 | OSDMap userMap = (OSDMap)response["User"]; |
@@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
218 | { "UserID", principalID.ToString() } | 218 | { "UserID", principalID.ToString() } |
219 | }; | 219 | }; |
220 | 220 | ||
221 | response = WebUtil.PostToService(m_serverUrl, requestArgs); | 221 | response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
222 | bool success = response["Success"].AsBoolean(); | 222 | bool success = response["Success"].AsBoolean(); |
223 | 223 | ||
224 | if (!success) | 224 | if (!success) |
@@ -297,7 +297,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
297 | { "UserID", userID.ToString() } | 297 | { "UserID", userID.ToString() } |
298 | }; | 298 | }; |
299 | 299 | ||
300 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 300 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
301 | if (response["Success"].AsBoolean()) | 301 | if (response["Success"].AsBoolean()) |
302 | return response["SessionID"].AsUUID().ToString(); | 302 | return response["SessionID"].AsUUID().ToString(); |
303 | else | 303 | else |