diff options
author | Justin Clark-Casey (justincc) | 2015-03-16 23:40:34 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-03-16 23:40:34 +0000 |
commit | eda09d87635683d92d1661f6bbedf678c879c08f (patch) | |
tree | c83df2e80607735bfe6641864e936902c697d7c2 /OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs | |
parent | Update version info to 0.8.2.0 (diff) | |
download | opensim-SC-eda09d87635683d92d1661f6bbedf678c879c08f.zip opensim-SC-eda09d87635683d92d1661f6bbedf678c879c08f.tar.gz opensim-SC-eda09d87635683d92d1661f6bbedf678c879c08f.tar.bz2 opensim-SC-eda09d87635683d92d1661f6bbedf678c879c08f.tar.xz |
Fix XBakes simulator-side authentication regression failure
Unlike the other connectors, XBakes uses a service auth retrieved from ServiceAuth.Create() and not code inherited from BaseServiceConnector.
Fixes regression from 7d3bafd5 (Wed 4 Mar 2015) where the new CompoundAuthenticator did not implement IServiceAuth.AddAuthorization()
Diffstat (limited to 'OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs')
-rw-r--r-- | OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs index 8c88d1c..a49952c 100644 --- a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs +++ b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs | |||
@@ -35,10 +35,17 @@ namespace OpenSim.Framework.ServiceAuth | |||
35 | { | 35 | { |
36 | public class CompoundAuthentication : IServiceAuth | 36 | public class CompoundAuthentication : IServiceAuth |
37 | { | 37 | { |
38 | public string Name { get { return "Compound"; } } | ||
39 | |||
38 | private List<IServiceAuth> m_authentications = new List<IServiceAuth>(); | 40 | private List<IServiceAuth> m_authentications = new List<IServiceAuth>(); |
39 | 41 | ||
40 | public int Count { get { return m_authentications.Count; } } | 42 | public int Count { get { return m_authentications.Count; } } |
41 | 43 | ||
44 | public List<IServiceAuth> GetAuthentors() | ||
45 | { | ||
46 | return new List<IServiceAuth>(m_authentications); | ||
47 | } | ||
48 | |||
42 | public void AddAuthenticator(IServiceAuth auth) | 49 | public void AddAuthenticator(IServiceAuth auth) |
43 | { | 50 | { |
44 | m_authentications.Add(auth); | 51 | m_authentications.Add(auth); |
@@ -49,7 +56,11 @@ namespace OpenSim.Framework.ServiceAuth | |||
49 | m_authentications.Remove(auth); | 56 | m_authentications.Remove(auth); |
50 | } | 57 | } |
51 | 58 | ||
52 | public void AddAuthorization(NameValueCollection headers) {} | 59 | public void AddAuthorization(NameValueCollection headers) |
60 | { | ||
61 | foreach (IServiceAuth auth in m_authentications) | ||
62 | auth.AddAuthorization(headers); | ||
63 | } | ||
53 | 64 | ||
54 | public bool Authenticate(string data) | 65 | public bool Authenticate(string data) |
55 | { | 66 | { |