gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use random session ID in httpd.c

Browse Source
This commit is contained in:
logicog
2025-12-01 18:26:46 +01:00
parent 9c21d94b65
commit b910692caf
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
httpd/httpd.c
+27 -14
View File
@@ -8,7 +8,7 @@
#include "uip.h" #include "uip.h"
#include "../html_data.h" #include "../html_data.h"
#define SESSION_ID "1234567890ab" #define SESSION_ID_LENGTH 12
#define SESSION_TIMEOUT 200 #define SESSION_TIMEOUT 200
// Upload Firmware to 1M // Upload Firmware to 1M
@@ -23,6 +23,7 @@
#pragma constseg BANK1 #pragma constseg BANK1
extern volatile __xdata uint8_t sfr_data[4]; extern volatile __xdata uint8_t sfr_data[4];
extern __code uint8_t * __code hex;
extern __code struct f_data f_data[]; extern __code struct f_data f_data[];
extern __code char * __code mime_strings[]; extern __code char * __code mime_strings[];
extern __xdata struct flash_region_t flash_region; extern __xdata struct flash_region_t flash_region;
@@ -53,7 +54,7 @@ __xdata uint32_t max_upload;
__xdata uint16_t short_parsed; __xdata uint16_t short_parsed;
__xdata char passwd[21]; __xdata char passwd[21];
__xdata char session_id[13]; __xdata char session_id[SESSION_ID_LENGTH + 1];
__xdata uint8_t authenticated; __xdata uint8_t authenticated;
__xdata uint32_t now; __xdata uint32_t now;
__xdata uint8_t *timeptr; __xdata uint8_t *timeptr;
@@ -217,7 +218,7 @@ __xdata uint8_t *scan_header(__xdata uint8_t *p)
session = p + 17; session = p + 17;
} }
if (content_type && is_word(content_type, "multipart/form-data; boundary")) { if (content_type && is_word(content_type, "multipart/form-data; boundary")) {
print_string("\nFound multiplart\n"); print_string("\nFound multipart\n");
content_type += 30; content_type += 30;
uint8_t i = 0; uint8_t i = 0;
while (content_type[i] != '\r' && content_type[i] != '\n') { while (content_type[i] != '\r' && content_type[i] != '\n') {
@@ -232,17 +233,13 @@ __xdata uint8_t *scan_header(__xdata uint8_t *p)
boundary[i + 4] = 0; boundary[i + 4] = 0;
} }
reg_read_m(RTL837X_REG_SEC_COUNTER); read_reg_timer(&now);
timeptr = (uint8_t*)&now; // Now is Little endian
timeptr[0] = sfr_data[3]; timeptr[1] = sfr_data[2]; timeptr[2] = sfr_data[1]; timeptr[3] = sfr_data[0];
if (session) { if (session) {
print_string("Session: "); print_string_x(session); print_string(", time now "); print_long(now);
print_string(" last session use: "); print_long(last_session_use); write_char('\n');
if (now - last_session_use > SESSION_TIMEOUT) { if (now - last_session_use > SESSION_TIMEOUT) {
print_string("Session expired\n"); print_string("Session expired\n");
} else { } else {
if (is_word(session, SESSION_ID)) // TODO: is_word_x if (is_word_x(session, session_id))
authenticated = 1; authenticated = 1;
else else
print_string("Invalid session cookie!\n"); print_string("Invalid session cookie!\n");
@@ -252,6 +249,20 @@ __xdata uint8_t *scan_header(__xdata uint8_t *p)
} }
void gen_random_bytes(__xdata uint8_t *b, uint8_t bytes)
{
__xdata uint8_t i = 0;
while (bytes) {
if (!i)
get_random_32();
b[--bytes] = itohex(sfr_data[i]);
if (!bytes) { break; }
b[--bytes] = itohex(sfr_data[i] >> 4 | sfr_data[i] << 4);
i = (i + 1) & 0x3;
}
}
/* /*
* Reads post data from the http stream and writes it into flash memory * Reads post data from the http stream and writes it into flash memory
* Input: the current position in the TCP buffer (uip_appdata) * Input: the current position in the TCP buffer (uip_appdata)
@@ -373,12 +384,14 @@ void handle_post(void)
p += 8; // Read also over "pwd=" p += 8; // Read also over "pwd="
if (is_word_x(p, passwd)) { if (is_word_x(p, passwd)) {
print_string("Password accepted!\n"); print_string("Password accepted!\n");
reg_read_m(RTL837X_REG_SEC_COUNTER); read_reg_timer(&last_session_use);
timeptr = (uint8_t*)&last_session_use; // last_session_use is Little endian gen_random_bytes(session_id, SESSION_ID_LENGTH);
timeptr[0] = sfr_data[3]; timeptr[1] = sfr_data[2]; timeptr[2] = sfr_data[1]; timeptr[3] = sfr_data[0]; session_id[SESSION_ID_LENGTH] = '\0';
slen = strtox(outbuf, "HTTP/1.1 302 Found\r\nLocation: index.html\r\n" \ slen = strtox(outbuf, "HTTP/1.1 302 Found\r\nLocation: index.html\r\n" \
"Set-Cookie: session=" SESSION_ID "; SameSite=Strict\r\n\r\n"); "Set-Cookie: session=");
for (register uint8_t i = 0; i < SESSION_ID_LENGTH; i++)
outbuf[slen++] = session_id[i];
slen += strtox(outbuf + slen, "; SameSite=Strict\r\n\r\n");
} else { } else {
slen = strtox(outbuf, "HTTP/1.1 302 Found\r\nLocation: login.html\r\n\r\n"); slen = strtox(outbuf, "HTTP/1.1 302 Found\r\nLocation: login.html\r\n\r\n");
} }