aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

fsp: prompt for password when the authentication fails.

Browse Source 
It works only for directory listings.
This commit is contained in:
Witold Filipczyk 2007-01-23 14:34:16 +01:00 committed by Kalle Olavi Niemitalo
parent a020450830
commit 8c5ef76e52
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/protocol/fsp/fsp.c
View File

@ -30,6 +30,7 @@
#include "network/connection.h" #include "network/connection.h"
#include "network/socket.h" #include "network/socket.h"
#include "osdep/osdep.h" #include "osdep/osdep.h"
#include "protocol/auth/auth.h"
#include "protocol/common.h" #include "protocol/common.h"
#include "protocol/protocol.h" #include "protocol/protocol.h"
#include "protocol/fsp/fsp.h" #include "protocol/fsp/fsp.h"
@ -176,13 +177,21 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
static void static void
do_fsp(struct connection *conn) do_fsp(struct connection *conn)
{ {
FSP_SESSION *ses;
struct stat sb; struct stat sb;
struct uri *uri = conn->uri; struct uri *uri = conn->uri;
struct auth_entry *auth;
unsigned char *host = get_uri_string(uri, URI_HOST); unsigned char *host = get_uri_string(uri, URI_HOST);
unsigned char *password = get_uri_string(uri, URI_PASSWORD);
unsigned char *data = get_uri_string(uri, URI_DATA); unsigned char *data = get_uri_string(uri, URI_DATA);
unsigned short port = (unsigned short)get_uri_port(uri); unsigned short port = (unsigned short)get_uri_port(uri);
FSP_SESSION *ses = fsp_open_session(host, port, password); unsigned char *password = NULL;
if (uri->passwordlen) password = get_uri_string(uri, URI_PASSWORD);
else {
auth = find_auth(conn->uri);
if (auth && auth->valid) password = auth->password;
}
ses = fsp_open_session(host, port, password);
if (!ses) if (!ses)
fsp_error(errno); fsp_error(errno);
@ -217,6 +226,16 @@ do_fsp(struct connection *conn)
#undef READ_SIZE #undef READ_SIZE
/* Kill the current connection and ask for a username/password for the next
* try. */
static void
prompt_username_pw(struct connection *conn)
{
add_auth_entry(conn->uri, "FSP", NULL, NULL, 0);
abort_connection(conn, S_OK);
}
/* FSP asynchronous connection management: */ /* FSP asynchronous connection management: */
static void static void
@ -224,20 +243,23 @@ fsp_got_error(struct socket *socket, struct read_buffer *rb)
{ {
int len = rb->length; int len = rb->length;
struct connection *conn = socket->conn; struct connection *conn = socket->conn;
int error;
if (len < 0) { if (len < 0) {
abort_connection(conn, -errno); abort_connection(conn, -errno);
return; return;
} }
if (len >= 0) {
int error;
rb->data[len] = '\0'; rb->data[len] = '\0';
error = atoi(rb->data); error = atoi(rb->data);
kill_buffer_data(rb, len); kill_buffer_data(rb, len);
switch (error) {
case EPERM:
prompt_username_pw(conn);
break;
default:
abort_connection(conn, -error); abort_connection(conn, -error);
return; break;
} }
} }
@ -309,11 +331,14 @@ fsp_got_header(struct socket *socket, struct read_buffer *rb)
abort_connection(conn, S_OUT_OF_MEM); abort_connection(conn, S_OUT_OF_MEM);
return; return;
} }
if (error)
if (error) {
mem_free_set(&conn->cached->content_type, stracpy("text/html"));
read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_error); read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_error);
else } else {
read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_data); read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_data);
} }
}
void void