Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2197c5bfae657d9d04733367eafe459ac8bad705
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2197c5bfae657d9d04733367eafe459ac8bad705
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2197c5bfae657d9d04733367eafe459ac8bad705
The branch, tlsa/401 has been updated
discards 7171768dcad7e4a418674a2a04f426bc3af8aec5 (commit)
discards 82bf68df8d6f314644358e1318da4700e333f619 (commit)
discards 5cf3abe20e7071e253ead25830010ef7ce9eb80e (commit)
discards c9d06a49990074c9c6099e3146cc126a17a65a4a (commit)
discards 42b9829086905b8c1ccab75aacb222f72784bbf3 (commit)
discards b2ee7dcead2899cfaddd26556ecd26e59d9b5710 (commit)
discards 597bac910515d51d2a28f97d20b317bd424ce487 (commit)
via 2197c5bfae657d9d04733367eafe459ac8bad705 (commit)
via 592b680e1989fd866b6932bea24ce431ed22f64a (commit)
via 12b941bdcb3e05f6b5405272b8dbf9e549c93cfb (commit)
via e715284c647c448f3fbab1f51f9f5b37c5e3503d (commit)
via 1d7551c53295345d37eb866ce0be06e5c2d7dea8 (commit)
via ac28654de1277ecdb2f3b7bfa67379b583a26644 (commit)
via 03ab720cc90c00696d6ee05f8dc150f72fa8fe62 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (7171768dcad7e4a418674a2a04f426bc3af8aec5)
\
N -- N -- N (2197c5bfae657d9d04733367eafe459ac8bad705)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2197c5bfae657d9d04733367eafe459ac8bad705
commit 2197c5bfae657d9d04733367eafe459ac8bad705
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
API: Don't expose urldb_{g|s}et_auth_details to frontends.
diff --git a/content/urldb.h b/content/urldb.h
index 0ad6426..c68c2a6 100644
--- a/content/urldb.h
+++ b/content/urldb.h
@@ -75,6 +75,27 @@ nserror urldb_set_url_content_type(struct nsurl *url,
content_type type);
/**
+ * Set authentication data for an URL
+ *
+ * \param url The URL to consider
+ * \param realm The authentication realm
+ * \param auth The authentication details (in form username:password)
+ */
+void urldb_set_auth_details(struct nsurl *url, const char *realm, const char
*auth);
+
+
+/**
+ * Look up authentication details in database
+ *
+ * \param url Absolute URL to search for
+ * \param realm When non-NULL, it is realm which can be used to determine
+ * the protection space when that's not been done before for given URL.
+ * \return Pointer to authentication details, or NULL if not found
+ */
+const char *urldb_get_auth_details(struct nsurl *url, const char *realm);
+
+
+/**
* Update an URL's visit data
*
* \param url The URL to update
diff --git a/include/netsurf/url_db.h b/include/netsurf/url_db.h
index 217cf8f..0716756 100644
--- a/include/netsurf/url_db.h
+++ b/include/netsurf/url_db.h
@@ -58,27 +58,6 @@ nserror urldb_save(const char *filename);
/**
- * Set authentication data for an URL
- *
- * \param url The URL to consider
- * \param realm The authentication realm
- * \param auth The authentication details (in form username:password)
- */
-void urldb_set_auth_details(struct nsurl *url, const char *realm, const char
*auth);
-
-
-/**
- * Look up authentication details in database
- *
- * \param url Absolute URL to search for
- * \param realm When non-NULL, it is realm which can be used to determine
- * the protection space when that's not been done before for given URL.
- * \return Pointer to authentication details, or NULL if not found
- */
-const char *urldb_get_auth_details(struct nsurl *url, const char *realm);
-
-
-/**
* Iterate over entries in the database which match the given prefix
*
* \param prefix Prefix to match
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=592b680e1989fd866b6932bea24ce431ed22f64a
commit 592b680e1989fd866b6932bea24ce431ed22f64a
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Atari: Move to new HTTP auth API.
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 6ee63b3..14e02e5 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -767,23 +767,30 @@ static void gui_set_clipboard(const char *buffer, size_t
length,
}
static void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
- bool bres;
- char * out = NULL;
- bres = login_form_do( url, (char*)realm, &out);
- if (bres) {
- NSLOG(netsurf, INFO, "url: %s, realm: %s, auth: %s\n",
- nsurl_access(url), realm, out);
- urldb_set_auth_details(url, realm, out);
- }
- if (out != NULL) {
- free( out );
- }
- if (cb != NULL) {
- cb(bres, cbpw);
- }
-
+ bool bres;
+ char * u_out = NULL;
+ char * p_out = NULL;
+
+ bres = login_form_do(url, (char*)realm, &u_out, &p_out);
+ if (bres) {
+ NSLOG(netsurf, INFO, "url: %s, realm: %s, auth: %s\n",
+ nsurl_access(url), realm, out);
+ }
+ if (cb != NULL) {
+ cb(u_out, p_out, cbpw);
+ }
+ if (u_out != NULL) {
+ free(u_out);
+ }
+ if (p_out != NULL) {
+ free(p_out);
+ }
}
static nserror
diff --git a/frontends/atari/login.c b/frontends/atari/login.c
index 1b21c5d..6736c3a 100644
--- a/frontends/atari/login.c
+++ b/frontends/atari/login.c
@@ -34,7 +34,7 @@
#include "atari/res/netsurf.rsh"
-bool login_form_do(nsurl * url, char * realm, char ** out)
+bool login_form_do(nsurl * url, char * realm, char ** u_out char ** p_out)
{
char user[255];
char pass[255];
@@ -45,8 +45,6 @@ bool login_form_do(nsurl * url, char * realm, char ** out)
user[0] = 0;
pass[0] = 0;
- // TODO: use auth details for predefined login data
- // auth = urldb_get_auth_details(url, realm);
tree = gemtk_obj_get_tree(LOGIN);
assert(tree != NULL);
@@ -57,10 +55,18 @@ bool login_form_do(nsurl * url, char * realm, char ** out)
get_string(tree, LOGIN_TB_USER, user);
get_string(tree, LOGIN_TB_PASSWORD, pass);
int size = strlen((char*)&user) + strlen((char*)&pass) + 2 ;
- *out = malloc(size);
- snprintf(*out, size, "%s:%s", user, pass);
+ *u_out = malloc(strlen((char*)&user) + 1);
+ *p_out = malloc(strlen((char*)&pass) + 1);
+ if (u_out == NULL || p_out == NULL) {
+ free(*u_out);
+ free(*p_out);
+ return false;
+ }
+ memcpy(*u_out, (char*)&user, strlen((char*)&user) + 1);
+ memcpy(*p_out, (char*)&pass, strlen((char*)&pass) + 1);
} else {
- *out = NULL;
+ *u_out = NULL;
+ *p_out = NULL;
}
return((exit_obj == LOGIN_BT_LOGIN));
}
diff --git a/frontends/atari/login.h b/frontends/atari/login.h
index b61808c..3b714dd 100644
--- a/frontends/atari/login.h
+++ b/frontends/atari/login.h
@@ -21,6 +21,6 @@
#include "utils/nsurl.h"
-bool login_form_do( nsurl * host, char * realm, char **cbpw );
+bool login_form_do(nsurl * url, char * realm, char ** u_out char ** p_out);
#endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=12b941bdcb3e05f6b5405272b8dbf9e549c93cfb
commit 12b941bdcb3e05f6b5405272b8dbf9e549c93cfb
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: Update to new HTTP auth API.
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index 4b2deb1..d01edef 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -72,12 +72,16 @@ void ro_gui_401login_init(void)
* Open the login dialog
*/
void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
lwc_string *host = nsurl_get_component(url, NSURL_HOST);
assert(host != NULL);
- ro_gui_401login_open(url, host, realm, cb, cbpw);
+ ro_gui_401login_open(url, host, realm, username, password, cb, cbpw);
lwc_string_unref(host);
}
@@ -88,11 +92,19 @@ void gui_401login_open(nsurl *url, const char *realm,
*/
void ro_gui_401login_open(nsurl *url, lwc_string *host, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
struct session_401 *session;
+ size_t len;
wimp_w w;
- const char *auth;
+
+ assert(host != NULL);
+ assert(username != NULL);
+ assert(password != NULL);
session = calloc(1, sizeof(struct session_401));
if (!session) {
@@ -100,32 +112,23 @@ void ro_gui_401login_open(nsurl *url, lwc_string *host,
const char *realm,
return;
}
- session->url = nsurl_ref(url);
if (realm == NULL)
realm = "Secure Area";
- auth = urldb_get_auth_details(session->url, realm);
- if (auth == NULL) {
- session->uname[0] = '\0';
- session->pwd[0] = '\0';
- } else {
- const char *pwd;
- size_t pwd_len;
-
- pwd = strchr(auth, ':');
- assert(pwd && pwd < auth + sizeof(session->uname));
- memcpy(session->uname, auth, pwd - auth);
- session->uname[pwd - auth] = '\0';
- ++pwd;
- pwd_len = strlen(pwd);
- assert(pwd_len < sizeof(session->pwd));
- memcpy(session->pwd, pwd, pwd_len);
- session->pwd[pwd_len] = '\0';
- }
+
+ session->url = nsurl_ref(url);
session->host = lwc_string_ref(host);
session->realm = strdup(realm);
session->cb = cb;
session->cbpw = cbpw;
+ len = strlen(username);
+ assert(len < sizeof(session->uname));
+ memcpy(session->uname, username, len + 1);
+
+ len = strlen(password);
+ assert(len < sizeof(session->pwd));
+ memcpy(session->pwd, password, len + 1);
+
if (!session->realm) {
nsurl_unref(session->url);
lwc_string_unref(session->host);
@@ -182,7 +185,7 @@ void ro_gui_401login_close(wimp_w w)
/* If ok didn't happen, send failure response */
if (session->cb != NULL)
- session->cb(false, session->cbpw);
+ session->cb(NULL, NULL, session->cbpw);
nsurl_unref(session->url);
lwc_string_unref(session->host);
@@ -205,26 +208,12 @@ void ro_gui_401login_close(wimp_w w)
bool ro_gui_401login_apply(wimp_w w)
{
struct session_401 *session;
- char *auth;
session = (struct session_401 *)ro_gui_wimp_event_get_user_data(w);
assert(session);
- auth = malloc(strlen(session->uname) + strlen(session->pwd) + 2);
- if (!auth) {
- NSLOG(netsurf, INFO, "calloc failed");
- ro_warn_user("NoMemory", 0);
- return false;
- }
-
- sprintf(auth, "%s:%s", session->uname, session->pwd);
-
- urldb_set_auth_details(session->url, session->realm, auth);
-
- free(auth);
-
- session->cb(true, session->cbpw);
+ session->cb(session->uname, session->pwd, session->cbpw);
/* Flag that we sent response by invalidating callback details */
session->cb = NULL;
diff --git a/frontends/riscos/gui.h b/frontends/riscos/gui.h
index 49a8ba4..b308c00 100644
--- a/frontends/riscos/gui.h
+++ b/frontends/riscos/gui.h
@@ -136,8 +136,12 @@ extern struct gui_download_table *riscos_download_table;
/* in 401login.c */
void ro_gui_401login_init(void);
-void gui_401login_open(struct nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw);
+void gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
/* in schedule.c */
extern bool sched_active;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=e715284c647c448f3fbab1f51f9f5b37c5e3503d
commit e715284c647c448f3fbab1f51f9f5b37c5e3503d
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Monkey: Update for new HTTP auth API.
diff --git a/frontends/monkey/401login.c b/frontends/monkey/401login.c
index 090f189..58335dd 100644
--- a/frontends/monkey/401login.c
+++ b/frontends/monkey/401login.c
@@ -27,20 +27,23 @@ typedef struct monkey401 {
struct monkey401 *r_next, *r_prev;
uint32_t num;
lwc_string *host; /* Ignore */
- nserror (*cb)(bool,void*);
+ nserror (*cb)(const char *, const char *, void *);
void *pw;
} monkey401_t;
static monkey401_t *m4_ring = NULL;
static uint32_t m4_ctr = 0;
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
monkey401_t *m4t = calloc(sizeof(*m4t), 1);
if (m4t == NULL) {
- cb(false, cbpw);
- return;
+ return NSERROR_NOMEM;
}
m4t->cb = cb;
m4t->pw = cbpw;
@@ -50,6 +53,8 @@ void gui_401login_open(nsurl *url, const char *realm,
fprintf(stdout, "401LOGIN OPEN M4 %u URL %s REALM %s\n",
m4t->num, nsurl_access(url), realm);
+
+ return NSERROR_OK;
}
diff --git a/frontends/monkey/401login.h b/frontends/monkey/401login.h
index e78355e..93606e5 100644
--- a/frontends/monkey/401login.h
+++ b/frontends/monkey/401login.h
@@ -5,5 +5,9 @@
#include "utils/errors.h"
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw);
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1d7551c53295345d37eb866ce0be06e5c2d7dea8
commit 1d7551c53295345d37eb866ce0be06e5c2d7dea8
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Haiku: Update for new HTTP auth API.
diff --git a/frontends/beos/gui.h b/frontends/beos/gui.h
index debb5f3..35f3134 100644
--- a/frontends/beos/gui.h
+++ b/frontends/beos/gui.h
@@ -35,7 +35,12 @@ extern bool nsbeos_done;
extern bool replicated;
int gui_init_replicant(int argc, char** argv);
-extern "C" void gui_401login_open(struct nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw);
+extern "C" void nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
extern "C" void nsbeos_gui_poll(void);
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index 8506298..18f9967 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -164,8 +164,12 @@ LoginAlert::MessageReceived(BMessage *message)
}
-extern "C" void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+extern "C" nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
lwc_string *host;
@@ -174,6 +178,8 @@ extern "C" void gui_401login_open(nsurl *url, const char
*realm,
create_login_window(url, host, realm, cb, cbpw);
free(host);
+
+ return NSERROR_OK;
}
//void create_login_window(struct browser_window *bw, const char *host,
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index f422920..9461559 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -655,7 +655,8 @@ void nsbeos_dispatch_event(BMessage *message)
{
nsurl* url;
BString realm;
- BString auth;
+ BString username;
+ BString password;
void* cbpw;
nserror (*cb)(bool proceed, void* pw);
@@ -663,15 +664,15 @@ void nsbeos_dispatch_event(BMessage *message)
break;
if (message->FindString("Realm", &realm) < B_OK)
break;
- if (message->FindString("Auth", &auth) < B_OK)
+ if (message->FindString("User", &username) < B_OK)
+ break;
+ if (message->FindString("Pass", &password) < B_OK)
break;
if (message->FindPointer("callback", (void**)&cb) <
B_OK)
break;
if (message->FindPointer("callback_pw", (void**)&cbpw)
< B_OK)
break;
- //printf("login to '%s' with '%s'\n", url.String(),
auth.String());
- urldb_set_auth_details(url, realm.String(),
auth.String());
- cb(true, cbpw);
+ cb(username.String(), password.String(), cbpw);
break;
}
default:
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=ac28654de1277ecdb2f3b7bfa67379b583a26644
commit ac28654de1277ecdb2f3b7bfa67379b583a26644
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
GTK: Update for new HTTP auth API.
diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c
index 91d8b37..83253a5 100644
--- a/frontends/gtk/login.c
+++ b/frontends/gtk/login.c
@@ -32,7 +32,9 @@ struct session_401 {
nsurl *url; /**< URL being fetched */
lwc_string *host; /**< Host for user display */
char *realm; /**< Authentication realm */
- nserror (*cb)(bool proceed, void *pw); /**< Continuation callback */
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw); /**< Continuation callback */
void *cbpw; /**< Continuation data */
GtkBuilder *x; /**< Our builder windows */
GtkWindow *wnd; /**< The login window itself */
@@ -83,14 +85,8 @@ static void nsgtk_login_ok_clicked(GtkButton *w, gpointer
data)
struct session_401 *session = (struct session_401 *)data;
const gchar *user = gtk_entry_get_text(session->user);
const gchar *pass = gtk_entry_get_text(session->pass);
- char *auth;
- auth = malloc(strlen(user) + strlen(pass) + 2);
- sprintf(auth, "%s:%s", user, pass);
- urldb_set_auth_details(session->url, session->realm, auth);
- free(auth);
-
- session->cb(true, session->cbpw);
+ session->cb(user, pass, session->cbpw);
destroy_login_window(session);
}
@@ -106,7 +102,7 @@ static void nsgtk_login_cancel_clicked(GtkButton *w,
gpointer data)
{
struct session_401 *session = (struct session_401 *) data;
- session->cb(false, session->cbpw);
+ session->cb(NULL, NULL, session->cbpw);
/* close and destroy the window */
destroy_login_window(session);
@@ -128,10 +124,12 @@ static void nsgtk_login_cancel_clicked(GtkButton *w,
gpointer data)
*/
static nserror
create_login_window(nsurl *url,
- lwc_string *host,
- const char *realm,
- nserror (*cb)(bool proceed, void *pw),
- void *cbpw)
+ lwc_string *host, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
struct session_401 *session;
GtkWindow *wnd;
@@ -177,8 +175,8 @@ create_login_window(nsurl *url,
gtk_label_set_text(GTK_LABEL(lhost), lwc_string_data(host));
gtk_label_set_text(lrealm, realm);
- gtk_entry_set_text(euser, "");
- gtk_entry_set_text(epass, "");
+ gtk_entry_set_text(euser, username);
+ gtk_entry_set_text(epass, password);
/* attach signal handlers to the Login and Cancel buttons in our new
* window to call functions in this file to process the login
@@ -209,10 +207,12 @@ create_login_window(nsurl *url,
/* exported function documented in gtk/login.h */
-void gui_401login_open(nsurl *url,
- const char *realm,
- nserror (*cb)(bool proceed, void *pw),
- void *cbpw)
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
lwc_string *host;
nserror res;
@@ -220,13 +220,15 @@ void gui_401login_open(nsurl *url,
host = nsurl_get_component(url, NSURL_HOST);
assert(host != NULL);
- res = create_login_window(url, host, realm, cb, cbpw);
+ res = create_login_window(url, host, realm, username, password,
+ cb, cbpw);
if (res != NSERROR_OK) {
NSLOG(netsurf, INFO, "Login init failed");
- /* creating login failed so cancel navigation */
- cb(false, cbpw);
+ return res;
}
lwc_string_unref(host);
+
+ return NSERROR_OK;
}
diff --git a/frontends/gtk/login.h b/frontends/gtk/login.h
index 00c2900..1be1b4c 100644
--- a/frontends/gtk/login.h
+++ b/frontends/gtk/login.h
@@ -26,6 +26,11 @@
/**
* login window request.
*/
-extern void gui_401login_open(struct nsurl *url, const char *realm, nserror
(*cb)(bool proceed, void *pw), void *cbpw);
+extern nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
#endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=03ab720cc90c00696d6ee05f8dc150f72fa8fe62
commit 03ab720cc90c00696d6ee05f8dc150f72fa8fe62
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Amiga: Update for new HTTP auth API.
diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c
index db15b43..78f46d3 100755
--- a/frontends/amiga/login.c
+++ b/frontends/amiga/login.c
@@ -70,14 +70,20 @@ static const struct ami_win_event_table ami_login_table = {
@todo check if this prevents us from quitting NetSurf */
};
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
- const char *auth;
struct gui_login_window *lw = calloc(1, sizeof(struct
gui_login_window));
lwc_string *host = nsurl_get_component(url, NSURL_HOST);
+ size_t len;
assert(host != NULL);
+ assert(username != NULL);
+ assert(password != NULL);
lw->host = host;
lw->url = nsurl_ref(url);
@@ -85,25 +91,13 @@ void gui_401login_open(nsurl *url, const char *realm,
lw->cb = cb;
lw->cbpw = cbpw;
- auth = urldb_get_auth_details(lw->url, realm);
-
- if (auth == NULL) {
- lw->uname[0] = '\0';
- lw->pwd[0] = '\0';
- } else {
- const char *pwd;
- size_t pwd_len;
-
- pwd = strchr(auth, ':');
- assert(pwd && pwd < auth + sizeof(lw->uname));
- memcpy(lw->uname, auth, pwd - auth);
- lw->uname[pwd - auth] = '\0';
- ++pwd;
- pwd_len = strlen(pwd);
- assert(pwd_len < sizeof(lw->pwd));
- memcpy(lw->pwd, pwd, pwd_len);
- lw->pwd[pwd_len] = '\0';
- }
+ len = strlen(username);
+ assert(len < sizeof(lw->uname));
+ memcpy(lw->uname, username, len + 1);
+
+ len = strlen(password);
+ assert(len < sizeof(lw->pwd));
+ memcpy(lw->pwd, password, len + 1);
lw->objects[OID_MAIN] = WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
@@ -177,13 +171,15 @@ void gui_401login_open(nsurl *url, const char *realm,
lw->win = (struct Window *)RA_OpenWindow(lw->objects[OID_MAIN]);
ami_gui_win_list_add(lw, AMINS_LOGINWINDOW, &ami_login_table);
+
+ return NSERROR_OK;
}
static void ami_401login_close(struct gui_login_window *lw)
{
/* If continuation exists, then forbid refetch */
if (lw->cb != NULL)
- lw->cb(false, lw->cbpw);
+ lw->cb(NULL, NULL, lw->cbpw);
DisposeObject(lw->objects[OID_MAIN]);
lwc_string_unref(lw->host);
@@ -195,16 +191,12 @@ static void ami_401login_close(struct gui_login_window
*lw)
static void ami_401login_login(struct gui_login_window *lw)
{
ULONG *user,*pass;
- STRPTR userpass;
GetAttr(STRINGA_TextVal,lw->objects[GID_USER],(ULONG *)&user);
GetAttr(STRINGA_TextVal,lw->objects[GID_PASS],(ULONG *)&pass);
- userpass = ASPrintf("%s:%s",user,pass);
- urldb_set_auth_details(lw->url,lw->realm,userpass);
- FreeVec(userpass);
-
- lw->cb(true, lw->cbpw);
+ /* TODO: Encoding conversion to UTF8 for `user` and `pass`? */
+ lw->cb(user, pass, lw->cbpw);
/* Invalidate continuation */
lw->cb = NULL;
diff --git a/frontends/amiga/login.h b/frontends/amiga/login.h
index 058fa59..e2fdf17 100755
--- a/frontends/amiga/login.h
+++ b/frontends/amiga/login.h
@@ -23,7 +23,11 @@
struct gui_login_window;
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw);
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
#endif
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/login.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontends/amiga/login.h b/frontends/amiga/login.h
index 1f7b8f7..e2fdf17 100755
--- a/frontends/amiga/login.h
+++ b/frontends/amiga/login.h
@@ -28,6 +28,6 @@ nserror gui_401login_open(nsurl *url, const char *realm,
nserror (*cb)(const char *username,
const char *password,
void *pw),
- void *cbpw)
+ void *cbpw);
#endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
