oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

added http authentication: http://user:passwd@host/music 

git-svn-id: https://svn.musicpd.org/mpd/trunk@1872 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-07-17 13:41:31 +00:00
parent a0227e8062
commit 3edf331543
1 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/inputStream_http.c
View File

@ -63,6 +63,7 @@ typedef struct _InputStreemHTTPData {
char * proxyHost; char * proxyHost;
int proxyPort; int proxyPort;
char * proxyAuth; char * proxyAuth;
char * httpAuth;
} InputStreamHTTPData; } InputStreamHTTPData;
void inputStream_initHttp() { void inputStream_initHttp() {
@ -154,9 +155,7 @@ static char * base64Dup(char * s) {
return ret; return ret;
} }
#define PROXY_AUTH_HEADER "Proxy-Authorization: Basic " static char * authString(char * header, char * user, char * password) {
static char * proxyAuthString(char * user, char * password) {
char * ret = NULL; char * ret = NULL;
int templen; int templen;
char * temp; char * temp;
@ -172,8 +171,8 @@ static char * proxyAuthString(char * user, char * password) {
temp64 = base64Dup(temp); temp64 = base64Dup(temp);
free(temp); free(temp);
ret = malloc(strlen(temp64)+strlen(PROXY_AUTH_HEADER)+3); ret = malloc(strlen(temp64)+strlen(header)+3);
strcpy(ret, PROXY_AUTH_HEADER); strcpy(ret, header);
strcat(ret, temp64); strcat(ret, temp64);
strcat(ret, "\r\n"); strcat(ret, "\r\n");
free(temp64); free(temp64);
@ -181,6 +180,12 @@ static char * proxyAuthString(char * user, char * password) {
return ret; return ret;
} }
#define PROXY_AUTH_HEADER "Proxy-Authorization: Basic "
#define HTTP_AUTH_HEADER "Authorization: Basic "
#define proxyAuthString(x, y) authString(PROXY_AUTH_HEADER, x, y)
#define httpAuthString(x, y) authString(HTTP_AUTH_HEADER, x, y)
static InputStreamHTTPData * newInputStreamHTTPData() { static InputStreamHTTPData * newInputStreamHTTPData() {
InputStreamHTTPData * ret = malloc(sizeof(InputStreamHTTPData)); InputStreamHTTPData * ret = malloc(sizeof(InputStreamHTTPData));
@ -198,6 +203,7 @@ static InputStreamHTTPData * newInputStreamHTTPData() {
ret->proxyAuth = NULL; ret->proxyAuth = NULL;
} }
ret->httpAuth = NULL;
ret->host = NULL; ret->host = NULL;
ret->path = NULL; ret->path = NULL;
ret->port = 80; ret->port = 80;
@ -214,6 +220,7 @@ static void freeInputStreamHTTPData(InputStreamHTTPData * data) {
if(data->host) free(data->host); if(data->host) free(data->host);
if(data->path) free(data->path); if(data->path) free(data->path);
if(data->proxyAuth) free(data->proxyAuth); if(data->proxyAuth) free(data->proxyAuth);
if(data->httpAuth) free(data->httpAuth);
free(data); free(data);
} }
@ -222,14 +229,52 @@ static int parseUrl(InputStreamHTTPData * data, char * url) {
char * temp; char * temp;
char * colon; char * colon;
char * slash; char * slash;
char * at;
int len; int len;
if(strncmp("http://",url,strlen("http://"))!=0) return -1; if(strncmp("http://",url,strlen("http://"))!=0) return -1;
temp = url+strlen("http://"); temp = url+strlen("http://");
slash = strchr(temp, '/');
colon = strchr(temp, ':'); colon = strchr(temp, ':');
at = strchr(temp, '@');
if(data->httpAuth) {
free(data->httpAuth);
data->httpAuth = NULL;
}
if(at) {
char * user;
char * passwd;
if(colon && colon < at) {
user = malloc(colon-temp+1);
strncpy(user, temp, colon-temp);
user[colon-temp] = '\0';
passwd = malloc(at-colon);
strncpy(passwd, colon+1, at-colon-1);
passwd[at-colon-1] = '\0';
}
else {
user = malloc(at-temp+1);
strncpy(user, temp, colon-temp);
user[colon-temp] = '\0';
passwd = strdup("");
}
data->httpAuth = httpAuthString(user, passwd);
free(user);
free(passwd);
temp = at+1;
colon = strchr(temp, ':');
}
slash = strchr(temp, '/');
if(slash && colon && slash <= colon) return -1; if(slash && colon && slash <= colon) return -1;
@ -390,7 +435,9 @@ static int finishHTTPInit(InputStream * inStream) {
data->path, data->host, "httpTest", "0.0.0", data->path, data->host, "httpTest", "0.0.0",
/*inStream->offset,*/ /*inStream->offset,*/
data->proxyAuth ? data->proxyAuth : "" ); data->proxyAuth ? data->proxyAuth :
(data->httpAuth ? data->httpAuth : "")
);
ret = write(data->sock, request, strlen(request)); ret = write(data->sock, request, strlen(request));
if(ret!=strlen(request)) { if(ret!=strlen(request)) {