scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-10-30 02:12:32 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fixing bug

Browse Source
This commit is contained in:
stephb9959
2022-06-14 07:22:17 -07:00
parent cb3f7a0872
commit a7e9c96f8d
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/RESTAPI/RESTAPI_totp_handler.cpp
View File

@@ -11,25 +11,35 @@ namespace OpenWifi {
auto Reset = GetBoolParameter("reset",false);
std::string QRCode;
std::cout << __LINE__ << std::endl;
if(TotpCache()->StartValidation(UserInfo_.userinfo,false,QRCode,Reset)) {
std::cout << __LINE__ << std::endl;
return SendFileContent(QRCode, "image/svg+xml","qrcode.svg");
}
std::cout << __LINE__ << std::endl;
return BadRequest(RESTAPI::Errors::InvalidCommand);
}
void RESTAPI_totp_handler::DoPut() {
std::cout << __LINE__ << std::endl;
auto Value = GetParameter("value","");
std::cout << __LINE__ << std::endl;
auto nextIndex = GetParameter("index",0);
std::cout << __LINE__ << std::endl;
bool moreCodes=false;
std::cout << __LINE__ << std::endl;
RESTAPI::Errors::msg Err;
std::cout << __LINE__ << std::endl;
if(TotpCache()->ContinueValidation(UserInfo_.userinfo,false,Value,nextIndex,moreCodes, Err)) {
Poco::JSON::Object Answer;
Answer.set("nextIndex", nextIndex);
Answer.set("moreCodes", moreCodes);
std::cout << __LINE__ << std::endl;
return ReturnObject(Answer);
}
std::cout << __LINE__ << std::endl;
return BadRequest(Err);
}

19
src/TotpCache.h
View File

@@ -31,24 +31,32 @@ namespace OpenWifi {
}
static std::string GenerateSecret(uint Size, std::string & Base32Secret) {
std::cout << __LINE__ << std::endl;
std::string R;
std::cout << __LINE__ << std::endl;
for(;Size;Size--) {
R += (char) MicroService::instance().Random(33,127);
}
std::cout << __LINE__ << std::endl;
Base32Secret = CppTotp::Bytes::toBase32( CppTotp::Bytes::ByteString{ (const u_char *)R.c_str()});
std::cout << __LINE__ << std::endl;
return R;
}
std::string GenerateQRCode(const std::string &Secret, const std::string &email) {
std::cout << __LINE__ << std::endl;
std::string uri{
"otpauth://totp/" + Issuer_ + ":" +
email + "?secret=" + Secret + "&issuer=" + Issuer_
};
std::cout << __LINE__ << std::endl;
qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText(uri.c_str(), qrcodegen::QrCode::Ecc::MEDIUM);
std::cout << __LINE__ << std::endl;
std::string svg = qrcodegen::toSvgString(qr0, 4); // See QrCodeGeneratorDemo
std::cout << __LINE__ << std::endl;
return svg;
}
@@ -71,9 +79,13 @@ namespace OpenWifi {
};
inline bool StartValidation(const SecurityObjects::UserInfo &User, bool Subscriber, std::string & QRCode, bool Reset) {
std::cout << __LINE__ << std::endl;
auto Hint = Cache_.find(User.id);
std::cout << __LINE__ << std::endl;
if(Hint!=Cache_.end() && Hint->second.Subscriber==Subscriber) {
std::cout << __LINE__ << std::endl;
if(Reset) {
std::cout << __LINE__ << std::endl;
std::string Base32Secret;
Hint->second.Subscriber = Subscriber;
Hint->second.Start = OpenWifi::Now();
@@ -82,15 +94,21 @@ namespace OpenWifi {
Hint->second.Secret = GenerateSecret(20,Base32Secret);
Hint->second.QRCode = QRCode = GenerateQRCode(Base32Secret, User.email);
Hint->second.LastCode.clear();
std::cout << __LINE__ << std::endl;
} else {
std::cout << __LINE__ << std::endl;
QRCode = Hint->second.QRCode;
}
return true;
}
std::cout << __LINE__ << std::endl;
std::string Base32Secret;
std::cout << __LINE__ << std::endl;
auto Secret = GenerateSecret(20, Base32Secret);
std::cout << __LINE__ << std::endl;
QRCode = GenerateQRCode(Base32Secret, User.email);
std::cout << __LINE__ << std::endl;
Entry E{ .Subscriber = Subscriber,
.Start = OpenWifi::Now(),
@@ -101,6 +119,7 @@ namespace OpenWifi {
.LastCode = 0
};
Cache_[User.id] = E;
std::cout << __LINE__ << std::endl;
return true;
}