Changeset 4596

Timestamp:

02/13/07 13:10:26 (2 years ago)

Author:

morris

Message:

Add basic p7 negotiation

Files:

• wired/branches/p7/config.h.in (modified) (3 diffs)
• wired/branches/p7/configure (modified) (14 diffs)
• wired/branches/p7/configure.in (modified) (2 diffs)
• wired/branches/p7/wired/accounts.c (modified) (3 diffs)
• wired/branches/p7/wired/clients.c (modified) (2 diffs)
• wired/branches/p7/wired/clients.h (modified) (2 diffs)
• wired/branches/p7/wired/server.c (modified) (11 diffs)
• wired/branches/p7/wired/transfers.c (modified) (4 diffs)

wired/branches/p7/config.h.in

@@ -7 +7 @@
-#undef HAVE_INTTYPES_H
-
+/* Define to 1 if you have the <libxml/parser.h> header file. */
+#undef HAVE_LIBXML_PARSER_H
+
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
@@ -12 +15 @@
-/* Define to 1 if you have the <openssl/sha.h> header file. */
-#undef HAVE_OPENSSL_SHA_H
-
-/* Define to 1 if you have the <openssl/ssl.h> header file. */
-#undef HAVE_OPENSSL_SSL_H
-
-/* Define to 1 if you have the <pthread.h> header file. */
@@ -39 +39 @@
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
-
-/* Define to the address where bug reports for this package should be sent. */

wired/branches/p7/configure

@@ -1388 +1388 @@
-
-
+
+
+
+
+
+
+
+
+
-# Get host
-ac_aux_dir=
@@ -3147 +3156 @@
-        fi
-
-        if test -d /usr/local/ssl/include; then
-                CPPFLAGS="$CPPFLAGS -I/usr/local/ssl/include"
-        fi
-
-        if test -d /usr/kerberos/include; then
-                CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-        fi
-
-
-        if test -d /usr/local/lib; then
-                LDFLAGS="$LDFLAGS -L/usr/local/lib"
-        fi
-
-        if test -d /usr/local/ssl/lib; then
-                LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib"
-        fi
-
@@ -4343 +4340 @@
-done
-
+
+
+
+        if test "$_wi_ssl_paths_added" != yes ; then
+                if test -d /usr/local/ssl/include; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/local/ssl/include"
+                fi
+
+                if test -d /usr/kerberos/include; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+                fi
+
+                if test -d /usr/local/ssl/lib; then
+                        LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib"
+                fi
+        fi
+
+        _wi_ssl_paths_added=yes
-
-
@@ -4599 +4614 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4746 +4770 @@
-_ACEOF
-
-SSL_library_init in -lssl
-SSL_library_init in -lssl
-ssl_SSL_library_init
+xmlParseFile in -lxml2
+xmlParseFile in -lxml2
+xml2_xmlParseFile
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-ssl
+xml2
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
@@ -4766 +4790 @@
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-SSL_library_init
+xmlParseFile
-int
-main ()
-{
-SSL_library_init
+xmlParseFile
-  ;
-  return 0;
@@ -4797 +4821 @@
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-ssl_SSL_library_init
+xml2_xmlParseFile
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ssl_SSL_library_init
+xml2_xmlParseFile
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -4808 +4832 @@
-LIBS=$ac_check_lib_save_LIBS
-fi
-ssl_SSL_library_init
-ssl_SSL_library_init
-ssl_SSL_library_init
-
-ssl
-
-
-
-
-OpenSSL
-
-OpenSSL
+xml2_xmlParseFile
+xml2_xmlParseFile
+xml2_xmlParseFile
+
+xml2
+
+
+
+
+libxml2
+
+libxml2
-
-    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&5
-OpenSSL
-
-OpenSSL
+libxml2
+
+libxml2
-
-    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&2;}
@@ -4836 +4860 @@
-
-
-OpenSSL
-
-OpenSSL
+libxml2
+
+libxml2
-
-    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&5
-OpenSSL
-
-OpenSSL
+libxml2
+
+libxml2
-
-    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&2;}
@@ -4856 +4880 @@
-
-
-CoreServices/CoreServices
+zlib
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5001 +5025 @@
-_ACEOF
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-fi
@@ -5009 +5134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5165 +5280 @@
-_ACEOF
-
+                LIBS="$LIBS -framework CoreServices -framework Carbon"
+
+fi
+
+done
+
+
+
+        case $host in
+                *-solaris*)
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS
+_ACEOF
+
+                        ;;
+        esac
+
+
+for ac_header in pthread.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to axel@zankasoftware.com ##
+## ------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
-                echo "$as_me:$LINENO: checking for pthreads" >&5
-echo $ECHO_N "checking for pthreads... $ECHO_C" >&6
@@ -5994 +6273 @@
-
-if test "$wd_libwired"; then
-ssl --enable-pthreads
+pthreads --enable-p7
-
-

wired/branches/p7/configure.in

@@ -174 +174 @@
-WI_INCLUDE_RESOLV_LIBRARY
-WI_INCLUDE_CRYPTO_LIBRARY
-
+
+
+
-WI_INCLUDE_CORESERVICES_FRAMEWORK
-WI_INCLUDE_PTHREADS
@@ -200 +202 @@
-
-if test "$wd_libwired"; then
-ssl --enable-pthreads
+pthreads --enable-p7
-        AC_CONFIG_SUBDIRS([libwired])
-fi

wired/branches/p7/wired/accounts.c

@@ -48 +48 @@
-
-
+static wi_string_t *                            _wd_accounts_password_provider(wi_string_t *);
+
-static wi_boolean_t                                     _wd_accounts_delete_from_file(wi_file_t *, wi_string_t *);
-static void                                                     _wd_accounts_reload_user(wi_string_t *);
@@ -76 +78 @@
-        wd_users_lock = wi_lock_init(wi_lock_alloc());
-        wd_groups_lock = wi_lock_init(wi_lock_alloc());
+        
+        wi_p7_socket_password_provider = _wd_accounts_password_provider;
-}
-
@@ -521 +525 @@
-#pragma mark -
-
+static wi_string_t * _wd_accounts_password_provider(wi_string_t *username) {
+        wd_account_t    *account;
+        
+        account = wd_accounts_read_user(username);
+        
+        if(!account)
+                return NULL;
+        
+        if(wi_string_length(account->password) == 0)
+                return wi_string_sha1(account->password);
+        
+        return account->password;
+}
+
+
+
+#pragma mark -
+
-static wi_boolean_t _wd_accounts_delete_from_file(wi_file_t *file, wi_string_t *name) {
-        wi_file_t               *tmpfile;

wired/branches/p7/wired/clients.c

@@ -166 +166 @@
-
-
-socket_t *
+p7_socket_t *p7_
-        wi_address_t    *address;
-
-        client->uid                             = wd_client_uid();
-
+
+
-        client->state                   = WD_CLIENT_STATE_CONNECTED;
-        client->login_time              = wi_time_interval();
-        client->idle_time               = client->idle_time;
-        
-
+client->
-        client->ip                              = wi_retain(wi_address_string(address));
-        client->host                    = wi_retain(wi_address_hostname(address));
@@ -193 +194 @@
-        
-        wi_release(client->socket);
+        wi_release(client->p7_socket);
-        
-        wi_release(client->account);

wired/branches/p7/wired/clients.h

@@ -57 +57 @@
-        wi_lock_t                                                       *socket_lock;
-        wi_socket_t                                                     *socket;
+        wi_p7_socket_t                                          *p7_socket;
-        
-        wi_lock_t                                                       *flag_lock;
@@ -95 +96 @@
-
-wd_client_t *                                                   wd_client_alloc(void);
-
+p7_
-
-void                                                                    wd_client_lock_socket(wd_client_t *);

wired/branches/p7/wired/server.c

@@ -36 +36 @@
-#include <wired/wired.h>
-
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+
-#include "accounts.h"
-#include "banlist.h"
@@ -61 +65 @@
-static wi_socket_context_t                      *wd_transfer_socket_context;
-
+static wi_p7_spec_t                                     *wd_p7_spec;
+static EVP_PKEY                                         *wd_p7_pkey;
+
-wi_string_t                                                     *wd_banner;
-
@@ -71 +78 @@
-        wi_string_t                             *ip, *string;
-        wi_address_family_t             family;
-
+
-        wd_control_sockets      = wi_array_init(wi_array_alloc());
-        wd_transfer_sockets     = wi_array_init(wi_array_alloc());
@@ -175 +182 @@
-        wi_string_t             *string;
-        wi_data_t               *data;
+
+        /* load protocol spec */
+        if(!wd_p7_spec) {
+                wd_p7_spec = wi_p7_spec_init_with_file(wi_p7_spec_alloc(), WI_STR("protocol.xml"), true);
+    
+                if(!wd_p7_spec)
+                        wi_log_err(WI_STR("Could not load protocol.xml: %m"));
+        }
-
-        /* reload banner */
@@ -208 +223 @@
-
-        /* set SSL cipher list */
-
+/*
-                if(!wi_socket_context_set_ssl_ciphers(wd_control_socket_context, wd_settings.controlcipher)) {
-                        wi_log_err(WI_STR("Could not set SSL cipher list \"%@\": %m"),
@@ -220 +235 @@
-                                wd_settings.transfercipher);
-           }
-
+*/
-
-        /* load SSL certificate */
-
+/*
-                if(!wi_socket_context_set_ssl_certificate(wd_control_socket_context, wd_settings.certificate) ||
-                   !wi_socket_context_set_ssl_certificate(wd_transfer_socket_context, wd_settings.certificate)) {
@@ -229 +244 @@
-                                wd_settings.certificate);
-                }
-
+*/
-}
-
@@ -237 +252 @@
-
-void wd_ssl_init(void) {
-
+/*
-                0xBC,0xBB,0x2B,0x4F,0x58,0x58,0x9C,0x4D,0x46,0x0D,0xBB,0x9E,
-                0x4D,0x85,0x69,0x56,0x43,0x5E,0xFB,0xC8,0xF6,0xC0,0xAC,0x8E,
@@ -260 +275 @@
-        if(!wi_socket_context_set_ssl_dh(wd_control_socket_context, dh1024_p, sizeof(dh1024_p), dh1024_g, sizeof(dh1024_g)) ||
-           !wi_socket_context_set_ssl_dh(wd_transfer_socket_context, dh1024_p, sizeof(dh1024_p), dh1024_g, sizeof(dh1024_g)))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -270 +306 @@
-        wi_pool_t                       *pool;
-        wi_socket_t                     *socket;
+        wi_p7_socket_t          *p7_socket;
-        wi_address_t            *address;
-        wi_string_t                     *ip;
@@ -297 +334 @@
-                wi_socket_set_direction(socket, WI_SOCKET_READ);
-                
+                p7_socket = wi_autorelease(wi_p7_socket_init_with_socket(wi_p7_socket_alloc(), socket, wd_p7_spec));
+                wi_p7_socket_set_private_key(p7_socket, wd_p7_pkey);
+                
+                if(!wi_p7_socket_accept(p7_socket, 10.0, WI_P7_ALL)) {
+                        wi_socket_close(socket);
+                        
+                        wi_log_err(WI_STR("Could not accept a connection: %m"));
+                        
+                        goto next;
+                }
+                
-                wi_log_info(WI_STR("Connect from %@"), ip);
-                
-                /* spawn a client thread */
-
+p7_
-
-                if(!wi_thread_create_thread(wd_control_thread, client))

wired/branches/p7/wired/transfers.c

@@ -587 +587 @@
-
-static void wd_transfer_download(wd_transfer_t *transfer) {
+#if 0
-        wi_pool_t                               *pool;
-        SSL                                             *ssl;
@@ -719 +720 @@
-        
-        wi_release(pool);
+#endif
-}
-
@@ -724 +726 @@
-
-static void wd_transfer_upload(wd_transfer_t *transfer) {
+#if 0
-        wi_pool_t                               *pool;
-        wi_string_t                             *path;
@@ -868 +871 @@
-        
-        wi_release(pool);
-
+
+