GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

kkdcp: fixes in post handler

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-02-27 14:10:16 +01:00
parent d0ae4e7e78
commit 1e18234d2f
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/worker-kkdcp.c
View File

@@ -113,11 +113,11 @@ int der_encode_inplace(uint8_t *raw, unsigned *raw_size, unsigned max_size, int
#define BUF_SIZE 16*1024 #define BUF_SIZE 16*1024
int post_kkdcp_handler(worker_st *ws, unsigned http_ver) int post_kkdcp_handler(worker_st *ws, unsigned http_ver)
{ {
int ret, e, fd; int ret, e, fd = -1;
struct http_req_st *req = &ws->req; struct http_req_st *req = &ws->req;
unsigned i, length; unsigned i, length;
kkdcp_st *kkdcp = NULL; kkdcp_st *kkdcp = NULL;
uint8_t *buf = NULL; uint8_t *buf;
uint32_t mlength; uint32_t mlength;
char realm[128] = ""; char realm[128] = "";
const char *reason = "Unknown"; const char *reason = "Unknown";
@@ -143,11 +143,19 @@ int post_kkdcp_handler(worker_st *ws, unsigned http_ver)
ws_add_score_to_ip(ws, ws->config->ban_points_kkdcp, 0); ws_add_score_to_ip(ws, ws->config->ban_points_kkdcp, 0);
oclog(ws, LOG_HTTP_DEBUG, "HTTP processing kkdcp framed request: %u bytes", (unsigned)req->body_length); oclog(ws, LOG_HTTP_DEBUG, "HTTP processing kkdcp framed request: %u bytes", (unsigned)req->body_length);
length = BUF_SIZE;
buf = talloc_size(ws, length);
if (buf == NULL) {
oclog(ws, LOG_ERR, "kkdcp: memory error");
reason = "memory error";
return -1;
}
ret = der_decode((uint8_t*)req->body, req->body_length, buf, &length, realm, sizeof(realm), &e); ret = der_decode((uint8_t*)req->body, req->body_length, buf, &length, realm, sizeof(realm), &e);
if (ret < 0) { if (ret < 0) {
oclog(ws, LOG_ERR, "kkdcp: DER decoding error: %s", asn1_strerror(e)); oclog(ws, LOG_ERR, "kkdcp: DER decoding error: %s", asn1_strerror(e));
reason = "DER decoding error"; reason = "DER decoding error";
return -1; goto fail;
} }
kr = &kkdcp->realms[0]; kr = &kkdcp->realms[0];
@@ -167,7 +175,7 @@ int post_kkdcp_handler(worker_st *ws, unsigned http_ver)
e = errno; e = errno;
oclog(ws, LOG_ERR, "kkdcp: socket error: %s", strerror(e)); oclog(ws, LOG_ERR, "kkdcp: socket error: %s", strerror(e));
reason = "socket error"; reason = "socket error";
return -1; goto fail;
} }
ret = connect(fd, (struct sockaddr*)&kr->addr, kr->addr_len); ret = connect(fd, (struct sockaddr*)&kr->addr, kr->addr_len);
@@ -178,14 +186,6 @@ int post_kkdcp_handler(worker_st *ws, unsigned http_ver)
goto fail; goto fail;
} }
length = BUF_SIZE;
buf = talloc_size(ws, length);
if (buf == NULL) {
oclog(ws, LOG_ERR, "kkdcp: memory error");
reason = "memory error";
goto fail;
}
oclog(ws, LOG_HTTP_DEBUG, "HTTP sending kkdcp request: %u bytes", (unsigned)length); oclog(ws, LOG_HTTP_DEBUG, "HTTP sending kkdcp request: %u bytes", (unsigned)length);
ret = send(fd, buf, length, 0); ret = send(fd, buf, length, 0);
if (ret != length) { if (ret != length) {
@@ -297,7 +297,8 @@ int post_kkdcp_handler(worker_st *ws, unsigned http_ver)
cleanup: cleanup:
talloc_free(buf); talloc_free(buf);
close(fd); if (fd != -1)
close(fd);
return ret; return ret;
} }