martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome-cgi: fixed returning a static file.

Browse Source
This commit is contained in:
Martin Preuss
2025-09-15 23:51:10 +02:00
parent fb365c7e1d
commit 3e00ac4dfb
3 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/aqhome-cgi/modules/common/mservice.c
View File

@@ -226,23 +226,18 @@ void AQH_ModService_AddFooter(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf
int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename) int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_BUFFER *dbuf)
{ {
GWEN_BUFFER *buf;
int rv; int rv;
buf=GWEN_Buffer_new(0, 256, 0, 1); rv=AQH_ModService_ReadStaticFile(m, lang, sFilename, dbuf);
AQH_ModService_AddHeader(m, lang, buf);
rv=AQH_ModService_ReadStaticFile(m, lang, sFilename, buf);
if (rv<0) { if (rv<0) {
AQCGI_SendResponseWithStatus(rq, 500, "Internal error"); AQCGI_Request_SetResponseCode(rq, 500);
GWEN_Buffer_free(buf); AQCGI_Request_SetResponseText(rq, "Internal Error");
return GWEN_ERROR_INTERNAL; return GWEN_ERROR_INTERNAL;
} }
AQH_ModService_AddFooter(m, lang, buf); AQCGI_Request_SetResponseCode(rq, 200);
AQCGI_Request_SetBufferResponseBody(rq, buf); AQCGI_Request_SetResponseText(rq, "Ok");
AQCGI_Request_AddResponseHeaderData(rq, "Content-type: text/html");
AQCGI_SendResponseWithStatus(rq, 200, "Ok");
return 0; return 0;
} }

2
apps/aqhome-cgi/modules/common/mservice.h
View File

@@ -42,7 +42,7 @@ AQH_SESSION *AQH_ModService_ReadSession(AQH_MODULE *m, AQCGI_REQUEST *rq);
void AQH_ModService_CalcSessionModPerms(AQH_MODULE *m, const AQH_SESSION *session); void AQH_ModService_CalcSessionModPerms(AQH_MODULE *m, const AQH_SESSION *session);
int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename); int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_BUFFER *dbuf);
int AQH_ModService_ReadStaticFile(AQH_MODULE *m, const char *lang, const char *filename, GWEN_BUFFER *dbuf); int AQH_ModService_ReadStaticFile(AQH_MODULE *m, const char *lang, const char *filename, GWEN_BUFFER *dbuf);
void AQH_ModService_AddPermDef(AQH_PERMDEF_LIST *permDefList, const char *id, uint32_t mask, const char *descr); void AQH_ModService_AddPermDef(AQH_PERMDEF_LIST *permDefList, const char *id, uint32_t mask, const char *descr);

66
apps/aqhome-cgi/modules/mroot.c
View File

@@ -39,10 +39,10 @@
static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName);
static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem);
static int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq); static int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf);
static int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq); static int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf);
static int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq); static int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf);
static AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq); static AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf);
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const
AQH_ModService_AddHeader(m, "en", dbuf); AQH_ModService_AddHeader(m, "en", dbuf);
if (strcasecmp(sLastPathElem, "login")==0) if (strcasecmp(sLastPathElem, "login")==0)
_handleRqLogin(m, rq); _handleRqLogin(m, rq, dbuf);
else if (strcasecmp(sLastPathElem, "signup")==0) { else if (strcasecmp(sLastPathElem, "signup")==0) {
AQCGI_Request_SetResponseCode(rq, 501); AQCGI_Request_SetResponseCode(rq, 501);
AQCGI_Request_SetResponseText(rq, "Not Implemented"); AQCGI_Request_SetResponseText(rq, "Not Implemented");
@@ -128,7 +128,7 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const
AQCGI_Request_SetResponseText(rq, "Not Implemented"); AQCGI_Request_SetResponseText(rq, "Not Implemented");
} }
else if (strcasecmp(sLastPathElem, "index.html")==0) else if (strcasecmp(sLastPathElem, "index.html")==0)
_handleRqIndex(m, rq); _handleRqIndex(m, rq, dbuf);
else { else {
AQCGI_Request_SetResponseCode(rq, 404); AQCGI_Request_SetResponseCode(rq, 404);
AQCGI_Request_SetResponseText(rq, "Not Found"); AQCGI_Request_SetResponseText(rq, "Not Found");
@@ -143,10 +143,10 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const
int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq) int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf)
{ {
if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET) if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET)
return AQH_ModService_RespondWithFile(m, rq, "en", "index.html"); return AQH_ModService_RespondWithFile(m, rq, "en", "index.html", dbuf);
else { else {
DBG_ERROR(NULL, "Invalid request method %d", AQCGI_Request_GetRequestMethod(rq)); DBG_ERROR(NULL, "Invalid request method %d", AQCGI_Request_GetRequestMethod(rq));
AQCGI_Request_SetResponseCode(rq, 405); AQCGI_Request_SetResponseCode(rq, 405);
@@ -157,14 +157,12 @@ int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq)
int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq) int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf)
{ {
int rv;
if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET) if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET)
AQH_ModService_RespondWithFile(m, rq, "en", "login.html"); AQH_ModService_RespondWithFile(m, rq, "en", "login.html", dbuf);
else if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_POST) else if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_POST)
_handleRqLoginPost(m, rq); _handleRqLoginPost(m, rq, dbuf);
else { else {
DBG_ERROR(NULL, "Invalid request method %d", AQCGI_Request_GetRequestMethod(rq)); DBG_ERROR(NULL, "Invalid request method %d", AQCGI_Request_GetRequestMethod(rq));
AQCGI_Request_SetResponseCode(rq, 405); AQCGI_Request_SetResponseCode(rq, 405);
@@ -176,18 +174,18 @@ int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq)
int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq) int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf)
{ {
AQH_SERVICE *sv; AQH_SERVICE *sv;
AQH_USER *user; AQH_USER *user;
AQH_SESSION *session; AQH_SESSION *session;
GWEN_BUFFER *dbuf; GWEN_BUFFER *tbuf;
GWEN_TIMESTAMP *ts; GWEN_TIMESTAMP *ts;
int rv; int rv;
DBG_ERROR(NULL, "Handling request"); DBG_ERROR(NULL, "Handling request");
sv=AQH_ModService_GetService(m); sv=AQH_ModService_GetService(m);
user=_getAndCheckUser(m, rq); user=_getAndCheckUser(m, rq, dbuf);
if (user==NULL) { if (user==NULL) {
DBG_INFO(NULL, "here"); DBG_INFO(NULL, "here");
AQCGI_Request_SetResponseCode(rq, 500); AQCGI_Request_SetResponseCode(rq, 500);
@@ -209,17 +207,17 @@ int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq)
/* generate session */ /* generate session */
DBG_ERROR(NULL, "Generating session"); DBG_ERROR(NULL, "Generating session");
dbuf=GWEN_Buffer_new(0, 64, 0, 1); tbuf=GWEN_Buffer_new(0, 64, 0, 1);
AQCGI_GenerateSessionId(dbuf); AQCGI_GenerateSessionId(tbuf);
session=AQH_Session_new(); session=AQH_Session_new();
AQH_Session_SetTimestampCreation(session, ts); AQH_Session_SetTimestampCreation(session, ts);
AQH_Session_SetTimestampLastAccess(session, ts); AQH_Session_SetTimestampLastAccess(session, ts);
AQH_Session_SetUid(session, GWEN_Buffer_GetStart(dbuf)); AQH_Session_SetUid(session, GWEN_Buffer_GetStart(tbuf));
GWEN_Buffer_free(dbuf); GWEN_Buffer_free(tbuf);
AQH_Session_SetUserAlias(session, AQH_User_GetAlias(user)); AQH_Session_SetUserAlias(session, AQH_User_GetAlias(user));
rv=AQH_Service_AddSession(sv, session); rv=AQH_Service_AddSession(sv, session);
if (rv<0) { if (rv<0) {
DBG_ERROR(NULL, "Error adding session for user \"%s\"", AQH_User_GetAlias(user)); DBG_ERROR(NULL, "Error adding session for user \"%s\" (%d)", AQH_User_GetAlias(user), rv);
AQCGI_Request_SetResponseCode(rq, 500); AQCGI_Request_SetResponseCode(rq, 500);
AQCGI_Request_SetResponseText(rq, "Internal Error"); AQCGI_Request_SetResponseText(rq, "Internal Error");
AQH_Session_free(session); AQH_Session_free(session);
@@ -228,9 +226,10 @@ int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq)
} }
/* add Set-Cookie header */ /* add Set-Cookie header */
dbuf=GWEN_Buffer_new(0, 256, 0, 1); tbuf=GWEN_Buffer_new(0, 256, 0, 1);
GWEN_Buffer_AppendArgs(dbuf, "Set-Cookie: session=%s; max-age=3600", AQH_Session_GetUid(session)); GWEN_Buffer_AppendArgs(tbuf, "Set-Cookie: session=%s; max-age=3600", AQH_Session_GetUid(session));
AQCGI_Request_AddResponseHeaderData(rq, GWEN_Buffer_GetStart(dbuf)); AQCGI_Request_AddResponseHeaderData(rq, GWEN_Buffer_GetStart(tbuf));
GWEN_Buffer_free(tbuf);
/* finish */ /* finish */
AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html"); AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html");
@@ -244,7 +243,7 @@ int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq)
AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq) AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf)
{ {
GWEN_DB_NODE *dbPost; GWEN_DB_NODE *dbPost;
@@ -262,7 +261,8 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq)
sPasswd=GWEN_DB_GetCharValue(dbPost, "password", 0, NULL); sPasswd=GWEN_DB_GetCharValue(dbPost, "password", 0, NULL);
if (!(sUserName && *sUserName && sPasswd && *sPasswd)) { if (!(sUserName && *sUserName && sPasswd && *sPasswd)) {
DBG_ERROR(NULL, "Either user name or password missing"); DBG_ERROR(NULL, "Either user name or password missing");
AQCGI_SendResponseWithStatus(rq, 400, "Bad Request"); AQCGI_Request_SetResponseCode(rq, 400);
AQCGI_Request_SetResponseText(rq, "Bad Request");
return NULL; return NULL;
} }
@@ -270,14 +270,16 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq)
user=AQH_Service_LoadUser(sv, sUserName); user=AQH_Service_LoadUser(sv, sUserName);
if (user==NULL) { if (user==NULL) {
DBG_ERROR(NULL, "User \"%s\" not found", sUserName); DBG_ERROR(NULL, "User \"%s\" not found", sUserName);
AQCGI_SendResponseWithStatus(rq, 403, "Forbidden"); AQCGI_Request_SetResponseCode(rq, 403);
AQCGI_Request_SetResponseText(rq, "Forbidden");
return NULL; return NULL;
} }
DBG_ERROR(NULL, "Loaded user \"%s\"", sUserName); DBG_ERROR(NULL, "Loaded user \"%s\"", sUserName);
if (AQH_User_GetState(user)!=AQH_UserState_Active) { if (AQH_User_GetState(user)!=AQH_UserState_Active) {
DBG_ERROR(NULL, "User \"%s\" not active", sUserName); DBG_ERROR(NULL, "User \"%s\" not active", sUserName);
AQCGI_SendResponseWithStatus(rq, 403, "Forbidden"); AQCGI_Request_SetResponseCode(rq, 403);
AQCGI_Request_SetResponseText(rq, "Forbidden");
AQH_User_free(user); AQH_User_free(user);
return NULL; return NULL;
} }
@@ -285,7 +287,8 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq)
hashedPaswd=AQH_User_GetHashedPassword(user); hashedPaswd=AQH_User_GetHashedPassword(user);
if (!(hashedPaswd && *hashedPaswd)) { if (!(hashedPaswd && *hashedPaswd)) {
DBG_ERROR(NULL, "User \"%s\" has no hashed password", sUserName); DBG_ERROR(NULL, "User \"%s\" has no hashed password", sUserName);
AQCGI_SendResponseWithStatus(rq, 403, "Forbidden"); AQCGI_Request_SetResponseCode(rq, 403);
AQCGI_Request_SetResponseText(rq, "Forbidden");
AQH_User_free(user); AQH_User_free(user);
return NULL; return NULL;
} }
@@ -295,7 +298,8 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq)
DBG_ERROR(NULL, "Hashed password: [%s]", GWEN_Buffer_GetStart(buf)); DBG_ERROR(NULL, "Hashed password: [%s]", GWEN_Buffer_GetStart(buf));
if (strcasecmp(GWEN_Buffer_GetStart(buf), hashedPaswd)!=0) { if (strcasecmp(GWEN_Buffer_GetStart(buf), hashedPaswd)!=0) {
DBG_ERROR(NULL, "Bad password for user \"%s\"", sUserName); DBG_ERROR(NULL, "Bad password for user \"%s\"", sUserName);
AQCGI_SendResponseWithStatus(rq, 403, "Forbidden"); AQCGI_Request_SetResponseCode(rq, 403);
AQCGI_Request_SetResponseText(rq, "Forbidden");
GWEN_Buffer_free(buf); GWEN_Buffer_free(buf);
AQH_User_free(user); AQH_User_free(user);
return NULL; return NULL;
@@ -308,6 +312,8 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq)
else { else {
DBG_ERROR(NULL, "No POST data"); DBG_ERROR(NULL, "No POST data");
AQCGI_SendResponseWithStatus(rq, 400, "Bad Request"); AQCGI_SendResponseWithStatus(rq, 400, "Bad Request");
AQCGI_Request_SetResponseCode(rq, 400);
AQCGI_Request_SetResponseText(rq, "Bad Request");
return NULL; return NULL;
} }
} }