mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 14:05:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

owncloud: Set proper useragent, fixed some comments and warnings.

Browse source
This commit is contained in:
Klaas Freitag 2012-02-20 11:14:53 +01:00 committed by Andreas Schneider
parent 936a32295f
commit 545115bfae
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/csync_owncloud.c
View file

@ -37,6 +37,7 @@
#include <neon/ne_dates.h> #include <neon/ne_dates.h>
#include "c_lib.h" #include "c_lib.h"
#include "csync.h"
#include "vio/csync_vio_module.h" #include "vio/csync_vio_module.h"
#include "vio/csync_vio_file_stat.h" #include "vio/csync_vio_file_stat.h"
@ -230,16 +231,26 @@ static int ne_error_to_errno(int ne_err)
return EIO; return EIO;
} }
/*
* helper method to build up a user text for SSL problems, called from the
* verify_sslcert callback.
*/
static void addSSLWarning( char *ptr, const char *warn, int len ) static void addSSLWarning( char *ptr, const char *warn, int len )
{ {
char *concatHere = ptr; char *concatHere = ptr;
int remainingLen = 0;
if( ! (warn && ptr )) return; if( ! (warn && ptr )) return;
int remainingLen = len - strlen(ptr); remainingLen = len - strlen(ptr);
concatHere = ptr + strlen(ptr); // put the write pointer to the end. concatHere = ptr + strlen(ptr); // put the write pointer to the end.
strncpy( concatHere, warn, remainingLen ); strncpy( concatHere, warn, remainingLen );
} }
/*
* Callback to verify the SSL certificate, called from libneon.
* It analyzes the SSL problem, creates a user information text and passes
* it to the csync callback to ask the user.
*/
#define LEN 4096 #define LEN 4096
static int verify_sslcert(void *userdata, int failures, static int verify_sslcert(void *userdata, int failures,
const ne_ssl_certificate *cert) const ne_ssl_certificate *cert)
@ -248,6 +259,7 @@ static int verify_sslcert(void *userdata, int failures,
char buf[NE_ABUFSIZ]; char buf[NE_ABUFSIZ];
int ret = -1; int ret = -1;
(void) cert;
memset( problem, 0, LEN ); memset( problem, 0, LEN );
addSSLWarning( problem, "There are problems with the SSL certificate:\n", LEN ); addSSLWarning( problem, "There are problems with the SSL certificate:\n", LEN );
@ -283,7 +295,7 @@ static int verify_sslcert(void *userdata, int failures,
ret = 0; ret = 0;
} }
} }
DEBUG_WEBDAV(("################ VERIFY_SSL CERT: %d\n", ret )); DEBUG_WEBDAV(("## VERIFY_SSL CERT: %d\n", ret ));
return ret; return ret;
} }
@ -335,6 +347,7 @@ static int dav_connect(const char *base_url) {
int rc; int rc;
char *p; char *p;
char protocol[6]; char protocol[6];
char uaBuf[256];
if (_connected) { if (_connected) {
return 0; return 0;
@ -345,7 +358,7 @@ static int dav_connect(const char *base_url) {
goto out; goto out;
} }
DEBUG_WEBDAV(("* Userinfo: %s\n", uri.userinfo )); // DEBUG_WEBDAV(("* Userinfo: %s\n", uri.userinfo ));
DEBUG_WEBDAV(("* scheme %s\n", uri.scheme )); DEBUG_WEBDAV(("* scheme %s\n", uri.scheme ));
DEBUG_WEBDAV(("* host %s\n", uri.host )); DEBUG_WEBDAV(("* host %s\n", uri.host ));
DEBUG_WEBDAV(("* port %d\n", uri.port )); DEBUG_WEBDAV(("* port %d\n", uri.port ));
@ -359,6 +372,7 @@ static int dav_connect(const char *base_url) {
} else { } else {
strncpy( protocol, "", 6 ); strncpy( protocol, "", 6 );
DEBUG_WEBDAV(("Invalid protocol %s, go outa here!", protocol )); DEBUG_WEBDAV(("Invalid protocol %s, go outa here!", protocol ));
rc = -1;
goto out; goto out;
} }
@ -374,7 +388,6 @@ static int dav_connect(const char *base_url) {
} }
} }
DEBUG_WEBDAV(("* user %s\n", dav_session.user ? dav_session.user : "")); DEBUG_WEBDAV(("* user %s\n", dav_session.user ? dav_session.user : ""));
/* DEBUG_WEBDAV(("* passwd %s\n", dav_session.pwd ? dav_session.pwd : "" )); */
if (uri.port == 0) { if (uri.port == 0) {
uri.port = ne_uri_defaultport(protocol); uri.port = ne_uri_defaultport(protocol);
@ -397,7 +410,8 @@ static int dav_connect(const char *base_url) {
} }
ne_set_read_timeout(dav_session.ctx, timeout); ne_set_read_timeout(dav_session.ctx, timeout);
ne_set_useragent( dav_session.ctx, "csync_owncloud" ); snprintf( uaBuf, sizeof(uaBuf), "csyncoC/%s",CSYNC_STRINGIFY( LIBCSYNC_VERSION ));
ne_set_useragent( dav_session.ctx, c_strdup( uaBuf ));
ne_set_server_auth(dav_session.ctx, ne_auth, 0 ); ne_set_server_auth(dav_session.ctx, ne_auth, 0 );
ne_ssl_set_verify( dav_session.ctx, verify_sslcert, 0 ); ne_ssl_set_verify( dav_session.ctx, verify_sslcert, 0 );