Changeset 21

Timestamp:

06/22/04 23:05:07

Author:

DenisG

Message:

[SubversionSharp] Add interactive authentication providers and AuthBaton?

Files:

• trunk/SubversionSharp/dev/src/SubversionSharp.prjx (modified) (1 diff)
• trunk/SubversionSharp/dev/src/Svn.cs (modified) (1 diff)
• trunk/SubversionSharp/dev/src/SvnAuthBaton.cs (added)
• trunk/SubversionSharp/dev/src/SvnAuthProvider.cs (modified) (5 diffs)
• trunk/SubversionSharp/test/src/Main.cs (modified) (2 diffs)

trunk/SubversionSharp/dev/src/SubversionSharp.prjx

@@ -11 +11 @@
-    <File name="./SvnAuthCred.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name="./SvnAuthSslServerCertInfo.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./SvnAuthBaton.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-  </Contents>
-  <References>

trunk/SubversionSharp/dev/src/Svn.cs

@@ -142 +142 @@
-                                                svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func,
-                                                IntPtr prompt_baton, int retry_limit, IntPtr pool);
+        #endregion
+        
+        #region AuthBaton
+        [DllImport("svn_client-1")] static extern
+        internal void svn_auth_open(out IntPtr auth_baton, IntPtr providers, IntPtr pool);
+        
+        [DllImport("svn_client-1")] static extern
+        internal void svn_auth_set_parameter(IntPtr auth_baton, IntPtr name, IntPtr value);
+        
+        [DllImport("svn_client-1")] static extern
+        internal IntPtr svn_auth_get_parameter(IntPtr auth_baton, IntPtr name);
-        #endregion
-    }

trunk/SubversionSharp/dev/src/SvnAuthProvider.cs

@@ -17 +17 @@
-    public struct SvnAuthProviderObject
-    {
-
+
+
-
-        #region Generic embedding functions of an IntPtr
@@ -23 +24 @@
-        {
-            mAuthProviderObject = ptr;
+            mAuthProvider = null;
+        }
+
+        private SvnAuthProviderObject(IntPtr ptr, SvnAuthProvider authProvider)
+        {
+            mAuthProviderObject = ptr;
+            mAuthProvider = authProvider;
-        }
-        
@@ -85 +93 @@
-
-        #region Wrapper client method
-Simple
+
-                                                    SimplePrompt promptFunc, 
-                                                    IntPtr promptBaton, int retryLimit, AprPool pool)
-        {
-            IntPtr authObj;
-
-
+
+
+
+
+
-        }
-                                                    
-Username
+
-                                                UsernamePrompt promptFunc,
-                                                IntPtr promptBaton, int retryLimit, AprPool pool)
-        {
-            IntPtr authObj; 
-
-
+
+
+
+
+
-        }
-                                                
@@ -138 +152 @@
-        }
-        
-SslServerTrust
+
-                                                SslServerTrustPrompt promptFunc,
-                                                IntPtr promptBaton, AprPool pool)
-        {
-            IntPtr authObj; 
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                                SslClientCertPrompt promptFunc,
-                                                IntPtr promptBaton, int retryLimit, AprPool pool)
-        {
-            IntPtr authObj; 
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                                SslClientCertPwPrompt promptFunc,
-                                                IntPtr promptBaton, int retryLimit, AprPool pool)
-        {
-            IntPtr authObj; 
-
-
+
+
+
+
+
-        }
-        #endregion
-    }
-    
-public
+internal
-    {
-        object mFunc;
+        object mWrapperFunc;
+        
+        public SvnAuthProvider(SvnAuthProviderObject.SimplePrompt func)
+        {
+            mFunc = func;
+            mWrapperFunc = new Svn.svn_auth_simple_prompt_func_t(SvnAuthSimplePrompt);
+        }
+        
+        public SvnAuthProvider(SvnAuthProviderObject.UsernamePrompt func)
+        {
+            mFunc = func;
+            mWrapperFunc = new Svn.svn_auth_username_prompt_func_t(SvnAuthUsernamePrompt);
+        }
+
+        public SvnAuthProvider(SvnAuthProviderObject.SslServerTrustPrompt func)
+        {
+            mFunc = func;
+            mWrapperFunc = new Svn.svn_auth_ssl_server_trust_prompt_func_t(SvnAuthSslServerTrustPrompt);
+        }
+
+        public SvnAuthProvider(SvnAuthProviderObject.SslClientCertPrompt func)
+        {
+            mFunc = func;
+            mWrapperFunc = new Svn.svn_auth_ssl_client_cert_prompt_func_t(SvnAuthSslClientCertPrompt);
+        }
+
+        public SvnAuthProvider(SvnAuthProviderObject.SslClientCertPwPrompt func)
+        {
+            mFunc = func;
+            mWrapperFunc = new Svn.svn_auth_ssl_client_cert_pw_prompt_func_t(SvnAuthSslClientCertPwPrompt);
+        }
+        
+        public object Wrapper
+        {
+            get
+            {
+                return(mWrapperFunc);
+            }
+        }
-        
-        private IntPtr SvnAuthSimplePrompt(out IntPtr cred, IntPtr baton, 
@@ -227 +289 @@
-        }
-                                                               
-
+//
-        private  IntPtr SvnAuthSslServerTrustPrompt(out IntPtr cred, IntPtr baton, 
-                                                    IntPtr realm, uint failures, 

trunk/SubversionSharp/test/src/Main.cs

@@ -2 +2 @@
-using System;
-using System.Diagnostics;
+using System.Collections;
-using Softec.AprSharp;
-using Softec.SubversionSharp;
@@ -15 +16 @@
-        SvnClientContext ctx = SvnClientContext.Create(pool);
-        ctx.Config = SvnConfig.GetConfig(pool);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        pool.Destroy();
-    }
+    
+    public static SvnError SimpleAuth(out SvnAuthCredSimple cred, IntPtr baton, 
+                           AprString realm, AprString username, 
+                           bool maySave, AprPool pool)
+    {
+        Console.WriteLine("Simple Authentication");
+        Console.WriteLine("---------------------");
+        Console.WriteLine("Realm: {0}", realm);
+        Console.WriteLine("");
+        
+        bool valid = false;
+        string line;
+        
+        while(!valid)
+        {
+            if (!username.IsNull)
+                Console.Write("Enter Username ({0}): ", username);
+            else
+                Console.Write("Enter Username: ");
+
+            line = Console.ReadLine();
+
+            if (line.Trim().Length == 0 && !username.IsNull)
+            {
+                line = username.ToString();
+                valid = true;
+            }
+            else if (line.Trim().Length > 0)
+            {
+                valid = true;
+            }
+        }
+        
+        cred = SvnAuthCredSimple.Alloc(pool);
+        cred.Username = new AprString(pool, line);
+        Console.Write("Enter Password: ");
+        cred.Password = new AprString(pool, Console.ReadLine());
+        cred.MaySave = maySave;
+        return(SvnError.NoError);
+    }
+    
+    public static SvnError UsernameAuth(out SvnAuthCredUsername cred, IntPtr baton, 
+                                        AprString realm, bool maySave, AprPool pool)
+    {
+        Console.WriteLine("Username Authentication:");
+        Console.WriteLine("------------------------");
+        Console.WriteLine("Realm: {0}", realm);
+        Console.WriteLine("");
+
+        bool valid = false;
+        string line;
+        
+        while(!valid)
+        {
+            Console.Write("Enter Username: ");
+
+            line = Console.ReadLine();
+
+            if (line.Trim().Length > 0)
+            {
+                valid = true;
+            }
+        }
+        
+        cred = SvnAuthCredUsername.Alloc(pool);
+        cred.Username = new AprString(pool, line);
+        cred.MaySave = maySave;
+        return(SvnError.NoError);
+    }
-}