experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restconf native: add body to bad request return

Browse source
This commit is contained in:
Olof hagsand 2021-05-01 17:53:29 +02:00
parent aaaeec92eb
commit 6e5e53e02e
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LICENSE.md
View file

@ -8,8 +8,6 @@ Either Apache License, Version 2.0 or GNU General Public License Version 3.
You choose. You choose.
Except as otherwise noted, Except as otherwise noted,
- see apps/restconf/libevhtp_parser.[ch]
BSD 3-clause: Copyright (c) 2010-2018, Mark Ellzey, Nathan French, Marcus Sundberg
The two licenses are included below. The two licenses are included below.

29
apps/restconf/restconf_main_native.c
View file

@ -884,16 +884,31 @@ close_ssl_evhtp_socket(int s,
static int static int
send_badrequest(clicon_handle h, send_badrequest(clicon_handle h,
int s, int s,
SSL *ssl) SSL *ssl,
char *body)
{ {
int retval = -1; int retval = -1;
char *buf = "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: 0\r\nContent-Type: text/plain\r\n\r\n"; cbuf *cb = NULL;
clicon_debug(1, "%s", __FUNCTION__); clicon_debug(1, "%s", __FUNCTION__);
if (buf_write(buf, strlen(buf)+1, s, ssl) < 0) if ((cb = cbuf_new()) == NULL){
clicon_err(OE_UNIX, errno, "cbuf_new");
goto done;
}
cprintf(cb, "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: 0\r\nContent-Type: text/plain\r\n\r\n");
if (body)
cprintf(cb, "Content-Length: %lu\r\n", strlen(body)+2);
else
cprintf(cb, "Content-Length: 0\r\n");
cprintf(cb, "\r\n");
if (body)
cprintf(cb, "%s\r\n", body);
if (buf_write(cbuf_get(cb), cbuf_len(cb)+1, s, ssl) < 0)
goto done; goto done;
retval = 0; retval = 0;
done: done:
if (cb)
cbuf_free(cb);
return retval; return retval;
} }
@ -964,7 +979,7 @@ restconf_connection(int s,
*/ */
if (connection_parse_nobev(buf, n, conn) < 0){ if (connection_parse_nobev(buf, n, conn) < 0){
clicon_debug(1, "%s connection_parse error", __FUNCTION__); clicon_debug(1, "%s connection_parse error", __FUNCTION__);
if (send_badrequest(h, s, conn->ssl) < 0) if (send_badrequest(h, s, conn->ssl, NULL) < 0)
goto done; goto done;
SSL_free(conn->ssl); SSL_free(conn->ssl);
if (close(s) < 0){ if (close(s) < 0){
@ -1005,7 +1020,7 @@ restconf_connection(int s,
} }
else{ else{
clicon_debug(1, "%s bev is NULL 3", __FUNCTION__); clicon_debug(1, "%s bev is NULL 3", __FUNCTION__);
if (send_badrequest(h, s, conn->ssl) < 0) /* actually error */ if (send_badrequest(h, s, conn->ssl, NULL) < 0) /* actually error */
goto done; goto done;
} }
} /* while moredata */ } /* while moredata */
@ -1177,7 +1192,7 @@ restconf_accept_client(int fd,
switch (e){ switch (e){
case SSL_ERROR_SSL: /* 1 */ case SSL_ERROR_SSL: /* 1 */
clicon_debug(1, "%s SSL_ERROR_SSL (non-ssl message on ssl socket)", __FUNCTION__); clicon_debug(1, "%s SSL_ERROR_SSL (non-ssl message on ssl socket)", __FUNCTION__);
if (send_badrequest(h, s, NULL) < 0) if (send_badrequest(h, s, NULL, "<errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\"><error><error-type>protocol</error-type><error-tag>malformed-message</error-tag><error-message>Non-ssl message on ssl socket: certificate required</error-message></error></errors>") < 0)
goto done; goto done;
SSL_free(ssl); SSL_free(ssl);
if (close(s) < 0){ if (close(s) < 0){
@ -1240,7 +1255,7 @@ restconf_accept_client(int fd,
X509_free(peercert); X509_free(peercert);
} }
else { /* Get certificates (if available) */ else { /* Get certificates (if available) */
if (send_badrequest(h, s, ssl) < 0) if (send_badrequest(h, s, ssl, NULL) < 0)
goto done; goto done;
clicon_debug(1, "%s conn-free (%p) 5", __FUNCTION__, conn); clicon_debug(1, "%s conn-free (%p) 5", __FUNCTION__, conn);
restconf_conn_free(conn); restconf_conn_free(conn);