[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Oct 6 11:16:44 CDT 2011


branch "master" has been updated
       via  392bea5bac84da946d5990ddd7afb977bdcb102c (commit)
       via  006cccac7e498e0faa88a747bdf39ba805198e41 (commit)
       via  2078b4a3901eaa3984036ce505ea61e07eac1258 (commit)
       via  ef8832a77930c026fc93c1585ed9bdc448a91834 (commit)
       via  1312c9c9d0f4c97f96f09a1291f6fe86710efda9 (commit)
       via  1b7505e4fffb20d625ee87a9fc4609ac342d97c1 (commit)
       via  e1d7bec2ebf996566cdf548790c8e4b8d6f7af70 (commit)
      from  cb5988e9a49ed1a914a52de38e26585408ea7270 (commit)

Summary of changes:
 slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice |   32 +++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 392bea5bac84da946d5990ddd7afb977bdcb102c
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Oct 5 17:05:47 2011 -0500

    Change the name of the method used for responding to an authentication challenge

diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index 9b96c5e..fc00dc5 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -197,7 +197,7 @@ module V1
          * authentication response (i.e. Authorization header) that Asterisk
          * SCF will send to the UAS that has sent an authentication challenge
          */
-        AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
+        AsteriskSCF::System::Hook::V1::HookResult respondToChallenge(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
     };
 
     sequence<AuthHook*> AuthHookSeq;

commit 006cccac7e498e0faa88a747bdf39ba805198e41
Merge: 2078b4a cb5988e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Oct 4 17:28:06 2011 -0500

    Merge branch 'master' into client-auth


commit 2078b4a3901eaa3984036ce505ea61e07eac1258
Merge: ef8832a 11fde89
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Oct 4 10:41:20 2011 -0500

    Merge branch 'master' into client-auth


commit ef8832a77930c026fc93c1585ed9bdc448a91834
Merge: 1312c9c 08dce54
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Sep 14 12:27:14 2011 -0500

    Merge branch 'master' into client-auth


commit 1312c9c9d0f4c97f96f09a1291f6fe86710efda9
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Sep 6 18:42:24 2011 -0500

    Add documentation and a member name change for consistency.

diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index 06ef9be..9b96c5e 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -169,10 +169,16 @@ module V1
 
     sequence<DigestChallenge> DigestChallengeSeq;
 
+    /**
+     * Client authentication structure.
+     * 
+     * This contains the data Asterisk SCF needs in order
+     * to create an authentication response
+     */
     struct ClientAuth
     {
         string realm;
-        string user;
+        string username;
         string password;
     };
 
@@ -180,10 +186,22 @@ module V1
 
     interface AuthHook
     {
+        /**
+         * Called when Asterisk SCF is a UAS. This is used to formulate the
+         * authentication challenge (i.e. WWW-Authenticate header) that Asterisk
+         * SCF will send to the UAC
+         */
 	    AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+        /**
+         * Called when Asterisk SCF is a UAC. This is used to formulate the
+         * authentication response (i.e. Authorization header) that Asterisk
+         * SCF will send to the UAS that has sent an authentication challenge
+         */
         AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
     };
 
+    sequence<AuthHook*> AuthHookSeq;
+
     enum RequestType
     {
 	// Examples of 'Dialog Establishing' requests include (but are not limited to):

commit 1b7505e4fffb20d625ee87a9fc4609ac342d97c1
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Sep 1 18:31:21 2011 -0500

    There's no good reason to have two separate hooks.

diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index accefb4..06ef9be 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -169,9 +169,19 @@ module V1
 
     sequence<DigestChallenge> DigestChallengeSeq;
 
+    struct ClientAuth
+    {
+        string realm;
+        string user;
+        string password;
+    };
+
+    sequence<ClientAuth> ClientAuthSeq;
+
     interface AuthHook
     {
-	AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+	    AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+        AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
     };
 
     enum RequestType
@@ -201,29 +211,6 @@ module V1
 	void clearAuthHooks();
     };
 
-    struct ClientAuth
-    {
-        string realm;
-        string user;
-        string password;
-    };
-
-    sequence<ClientAuth> ClientAuthSeq;
-
-    interface AuthClientHook
-    {
-        AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
-    };
-
-    sequence<AuthClientHook*> AuthClientHookSeq;
-
-    interface AuthClientExtensionPoint
-    {
-        void addAuthClientHook(AuthClientHook *hook, int priority, RequestTypeSeq requestTypes);
-        void removeAuthClientHook(AudhClientHook *hook);
-        void clearAuthClientHooks();
-    }
-
 }; /* End of module V1 */
 
 }; /* End of module ExtensionPoint */

commit e1d7bec2ebf996566cdf548790c8e4b8d6f7af70
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Sep 1 18:15:17 2011 -0500

    Add extension point for client authentication.

diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index 2b85aa2..accefb4 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -201,6 +201,29 @@ module V1
 	void clearAuthHooks();
     };
 
+    struct ClientAuth
+    {
+        string realm;
+        string user;
+        string password;
+    };
+
+    sequence<ClientAuth> ClientAuthSeq;
+
+    interface AuthClientHook
+    {
+        AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
+    };
+
+    sequence<AuthClientHook*> AuthClientHookSeq;
+
+    interface AuthClientExtensionPoint
+    {
+        void addAuthClientHook(AuthClientHook *hook, int priority, RequestTypeSeq requestTypes);
+        void removeAuthClientHook(AudhClientHook *hook);
+        void clearAuthClientHooks();
+    }
+
 }; /* End of module V1 */
 
 }; /* End of module ExtensionPoint */

-----------------------------------------------------------------------


-- 
asterisk-scf/release/slice.git



More information about the asterisk-scf-commits mailing list