Commit 646c0e68 authored by jan.koester's avatar jan.koester
Browse files

security fixes

parent 002ecad2
Loading
Loading
Loading
Loading
Loading
+2 −2
Changes for data/authdb.js: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
const selectElement = document.querySelector("#domain_selector");
const urlresult = window.location.toString();
var selectElement = document.querySelector("#domaindid");
var urlresult = window.location.toString();

if(selectElement){
    selectElement.addEventListener("change", (event) => {
+12 −7
Changes for src/admin.cpp: 12 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -588,7 +588,8 @@ namespace authdb {
            Domain domain;

            dest.clear();
            dest << "<form method=\"post\" ><select name=\"domaindid\" onchange=\"this.form.submit()\">";
            dest << "<form method=\"post\">"
                    << "<select name=\"domaindid\" onchange=\"this.form.submit()\">";

            dest << "<option value=\"admin\" >admin.local</option>";

@@ -1404,12 +1405,14 @@ namespace authdb {
                    throw AuthBackendError("listSessions: wrong url!");
            }

            std::cout << did.c_str() << std::endl;

            for(const SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){
                uuid sdid;

                curdat->getDid(sdid);

                if( ( strcmp(cdid,"admin")==0 && did.empty() ) ||
                if( ( strcmp(cdid,"admin")==0 && sdid.empty() ) ||
                    ( !did.empty() && did==sdid ) ) {

                    libhtmlpp::HtmlString listel;
@@ -2094,7 +2097,9 @@ namespace authdb {
                    size_t upos=sizeof(authdb::AuthHeader);
                    user.info(*backend,udat,upos);

                    if(username==udat.getUsername() && pwhash==udat.getPwHash() ){
                    if(!username.empty() && username==udat.getUsername() &&
                        !pwhash.empty() && pwhash==udat.getPwHash() ){

                        libhttppp::HttpCookie cookie;
                        uuid sid;
                        const SessionData *cses=_Session.addSession(*backend,did,udat.uid);
@@ -2472,17 +2477,17 @@ namespace authdb {
        void SettingsController(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){

            libhttppp::HttpCookie cookie;
            uuid_t ssid;
            const SessionData *sdat;
            const SessionData *sdat=nullptr;

            uuid ssid;

            try{
                uuid_clear(ssid);

                cookie.parse(curreq);

                for(libhttppp::HttpCookie::CookieData *cur=cookie.getfirstCookieData(); cur; cur=cur->nextCookieData()){
                    if(strcmp(cur->getKey(),"authdbid")==0){
                        if(uuid_parse(cur->getValue(),ssid)==0)
                            if(ssid.parse(cur->getValue())==0)
                                sdat=_Session.getSession(ssid);
                        break;
                    }
+19 −3
Changes for src/uuid.cpp: 19 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -39,11 +39,23 @@ authdb::uuid::uuid(const uuid_t& src){
    uuid_copy(value,src);
}

authdb::uuid::uuid(const char* src) : uuid() {
    uuid_parse(src,value);
}


authdb::uuid::~uuid(){
}

int authdb::uuid::parse(const char* src){
     return uuid_parse(src,value);
}


const bool authdb::uuid::empty() const{
    return uuid_is_null(value);
    if(uuid_is_null(value)==1)
        return true;
    return false;
}

void authdb::uuid::clear(){
@@ -52,11 +64,15 @@ void authdb::uuid::clear(){


bool authdb::uuid::operator==(const uuid_t src) const{
    return uuid_compare(value,src);
    if(uuid_compare(value,src)==0)
        return true;
    return false;
}

bool authdb::uuid::operator==(const uuid src) const{
    return uuid_compare(value,src.value);
    if(uuid_compare(value,src.value)==0)
        return true;
    return false;
}

void authdb::uuid::operator=(const uuid& src){
+4 −0
Changes for src/uuid.h: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ namespace authdb{
      uuid();
      uuid(const uuid &src);
      uuid(const uuid_t &src);
      uuid(const char *src);

      ~uuid();

      void generate();
@@ -45,6 +47,8 @@ namespace authdb{

      const bool empty() const;

      int parse(const char* src);

      void clear();

      void operator=(const uuid_t &src);