Brad Arant
b0cadc3f08
JetCore engine (Tag.cpp/.h, Global.cpp/.h, __*.cpp tag classes): - Numerous __mysql.cpp connection-pooling correctness fixes (stale result sets, double-indirection sessionid bugs, field caching, pool keying) and a session-registration-before-connection-confirmed ordering fix (dangling pointer on a failed connect) - Tag.cpp: large body of fixes to the tag-dispatch/container-scanning logic (bare-name fallback, database aliasing, single-quote handling, @-prefix session variable resolution, TAGDEF caching, nested split-tag scanning for if/while/until/ifrow so an inner one doesn't corrupt an outer one's own boundary scan) plus the process-first rendering order fix (a <process> now runs before <checksession>/page resolution, fixing a real "blank page after successful login" bug) - Global.h/.cpp: added imapSessions (parallel to the existing __mysql* session map) for the new <imap> tag family - __whiledir.cpp/__include.cpp: caching and directory-name-aliasing fixes - __call.cpp/.h: fixed a dangling-pointer bug - __write.cpp: fixed an O_WRONLY-only open that couldn't create a new file - __ifrow.cpp/__sql.cpp: fixed the same sessionid double-indirection bug __mysql.cpp had (resolveKeyword's result was being used as a map key lookup instead of the resolved value itself) jetc compiler (jetc/JetParser.cpp/.h, JetCodegen.cpp/.h, JetAST.h, jetc.cpp, build-shared.sh, build-compiled.sh): - Parser fixes: inline <include>, nested-quote handling, void-tag recognition - Codegen fixes and expanded AST support - build-shared.sh: atomic rename into place for a freshly-built .jtc (a live server dlopen()ing the same path mid-rebuild was corrupting its own already-mapped view of the old file) and a staleness check so a cached JetCore .o doesn't silently keep serving yesterday's fixes forever - Added -lssl to both build scripts' link lines (needed once the new <imap> tag's client-side TLS code existed - previously nothing in this codebase used OpenSSL's SSL/TLS client API, only libcrypto) Site content (jetc/barant-site/): SPA (fetch-and-swap navigation) rollout across essentially every .page/.jet/.section/.tag/.proc/.method file - dynamic-content fixes, fragment-mode stripping, native $[@name] session variables replacing older mechanisms, and this session's own checkout.page redesign, login start-param redirect fix, and per-page side-menu (menu.bar/$[PAGE].menu) refresh support. Completed the earlier main.css/control.css move from assets/ to assets/images/ (git still showed the old paths as tracked-but-deleted until now). Deliberately left out of this commit: dozens of .pre-<description>- <date> manual backup files (this session's and earlier ones' own before/after snapshots, not meant for permanent history), compiled .jtc build outputs, ad hoc test binaries and scripts under jetc/ (login_asan, wcwc_test, optest2_bin, etc.), and jetc/__pycache__/ - none of these are meant to be tracked; a .gitignore covering them would be worth adding separately.
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
#include "Global.h"
|
|
#include "Exception.h"
|
|
#include "__mysql.h"
|
|
#include "__imap.h"
|
|
#include <iostream>
|
|
#include <stdlib.h>
|
|
#include <cstdio>
|
|
|
|
namespace jet {
|
|
|
|
Global::Global(char **envp) : envp(envp) {
|
|
cookies.setDelimiter(";");
|
|
}
|
|
|
|
Global::~Global() {
|
|
// JFile's destructor (via MFile::~MFile()->update()) is what actually
|
|
// writes the session JSON back to disk - it has to run for session
|
|
// persistence to happen at all, so sessionFile can't be left as a
|
|
// leaked, never-deleted pointer the way cgiData currently is.
|
|
if(sessionFile)
|
|
delete sessionFile;
|
|
}
|
|
|
|
void Global::dump() {
|
|
for (auto i = variables.begin(); i != variables.end(); i++)
|
|
std::cout << i->first << "=[" << i->second << "]" << std::endl;
|
|
}
|
|
|
|
bool Global::sessionExists(coreutils::MString sessionId) {
|
|
return sessions.find(sessionId) != sessions.end();
|
|
}
|
|
|
|
void Global::addSession(coreutils::MString sessionId, __mysql *mysql) {
|
|
if(sessionExists(sessionId))
|
|
throw coreutils::Exception("sessionid already exists.");
|
|
sessions[sessionId] = mysql;
|
|
}
|
|
|
|
void Global::removeSession(coreutils::MString sessionId) {
|
|
sessions.erase(sessionId);
|
|
}
|
|
|
|
__mysql * Global::getSession(coreutils::MString sessionId) {
|
|
if(sessions.find(sessionId) == sessions.end())
|
|
throw coreutils::Exception("requested session is not available.");
|
|
return sessions[sessionId];
|
|
}
|
|
|
|
bool Global::imapSessionExists(coreutils::MString sessionId) {
|
|
return imapSessions.find(sessionId) != imapSessions.end();
|
|
}
|
|
|
|
void Global::addImapSession(coreutils::MString sessionId, __imap *imap) {
|
|
if(imapSessionExists(sessionId))
|
|
throw coreutils::Exception("imap sessionid already exists.");
|
|
imapSessions[sessionId] = imap;
|
|
}
|
|
|
|
void Global::removeImapSession(coreutils::MString sessionId) {
|
|
imapSessions.erase(sessionId);
|
|
}
|
|
|
|
__imap * Global::getImapSession(coreutils::MString sessionId) {
|
|
if(imapSessions.find(sessionId) == imapSessions.end())
|
|
throw coreutils::Exception("requested imap session is not available.");
|
|
return imapSessions[sessionId];
|
|
}
|
|
|
|
coreutils::ZString Global::getSessionVariable(coreutils::MString &splitName) {
|
|
if(sessions.find(splitName[0]) == sessions.end())
|
|
throw coreutils::Exception("requested session is not available in variable.");
|
|
return sessions[splitName[0]]->getColumnValue(splitName[1]);
|
|
}
|
|
|
|
void Global::outputHeaders() {
|
|
if(headers.size() > 0) {
|
|
for(auto header = headers.begin();
|
|
header != headers.end();
|
|
++header) {
|
|
std::cout << header->first << ": " << header->second << std::endl;
|
|
}
|
|
std::cout << std::endl;
|
|
}
|
|
}
|
|
|
|
}
|