static void
conn_request(void *ptr, http_request_t *request, http_response_t **response)
{
+ const char realm[] = "airplay";
raop_conn_t *conn = ptr;
raop_t *raop = conn->raop;
}
res = http_response_init("RTSP/1.0", 200, "OK");
- if (strlen(raop->password)) {
+
+ /* We need authorization for everything else than OPTIONS request */
+ if (strcmp(method, "OPTIONS") != 0 && strlen(raop->password)) {
const char *authorization;
authorization = http_request_get_header(request, "Authorization");
logger_log(conn->raop->logger, LOGGER_DEBUG, "Our nonce: %s", conn->nonce);
logger_log(conn->raop->logger, LOGGER_DEBUG, "Authorization: %s", authorization);
}
- if (!digest_is_valid("AppleTV", raop->password, conn->nonce, method, http_request_get_url(request), authorization)) {
+ if (!digest_is_valid(realm, raop->password, conn->nonce, method, http_request_get_url(request), authorization)) {
char *authstr;
int authstrlen;
/* Allocate the authenticate string */
- authstrlen = sizeof("Digest realm=\"AppleTV\", nonce=\"\"") + sizeof(conn->nonce) + 1;
+ authstrlen = sizeof("Digest realm=\"\", nonce=\"\"") + sizeof(realm) + sizeof(conn->nonce) + 1;
authstr = malloc(authstrlen);
/* Concatenate the authenticate string */
memset(authstr, 0, authstrlen);
- strcat(authstr, "Digest realm=\"AppleTV\", nonce=\"");
+ strcat(authstr, "Digest realm=\"");
+ strcat(authstr, realm);
+ strcat(authstr, "\", nonce=\"");
strcat(authstr, conn->nonce);
strcat(authstr, "\"");
res = http_response_init("RTSP/1.0", 401, "Unauthorized");
http_response_add_header(res, "WWW-Authenticate", authstr);
free(authstr);
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Authentication unsuccessful, sending Unauthorized");
} else {
- logger_log(conn->raop->logger, LOGGER_DEBUG, "AUTHENTICATION SUCCESS!");
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Authentication successful!");
}
}
conn->raop_rtp = raop_rtp_init(raop->logger, &raop->callbacks, remotestr, rtpmapstr, fmtpstr, aeskey, aesiv);
if (!conn->raop_rtp) {
logger_log(conn->raop->logger, LOGGER_ERR, "Error initializing the audio decoder");
+ http_response_set_disconnect(res, 1);
}
sdp_destroy(sdp);
}
if (conn->raop_rtp) {
raop_rtp_start(conn->raop_rtp, use_udp, remote_cport, remote_tport, &cport, &tport, &dport);
} else {
- logger_log(conn->raop->logger, LOGGER_CRIT, "RAOP not initialized at SETUP, playing will fail!");
+ logger_log(conn->raop->logger, LOGGER_ERR, "RAOP not initialized at SETUP, playing will fail!");
+ http_response_set_disconnect(res, 1);
}
memset(buffer, 0, sizeof(buffer));
}
http_response_finish(res, NULL, 0);
- logger_log(conn->raop->logger, LOGGER_DEBUG, "Got request %s with URL %s", method, http_request_get_url(request));
+ logger_log(conn->raop->logger, LOGGER_DEBUG, "Handled request %s with URL %s", method, http_request_get_url(request));
*response = res;
}