rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5657 Fix SerialKey whitespace

This commit is contained in:
Andrew Nelless 2016-10-17 16:34:44 +01:00
parent b5a6ae0a94
commit c7dc198d82
2 changed files with 160 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
src/lib/shared/SerialKey.cpp
View File

@ -29,27 +29,27 @@
using namespace std; using namespace std;
SerialKey::SerialKey(Edition edition): SerialKey::SerialKey(Edition edition):
m_userLimit(1), m_userLimit(1),
m_warnTime(ULLONG_MAX), m_warnTime(ULLONG_MAX),
m_expireTime(ULLONG_MAX), m_expireTime(ULLONG_MAX),
m_edition(edition), m_edition(edition),
m_trial(false), m_trial(false),
m_valid(true) m_valid(true)
{ {
} }
SerialKey::SerialKey(std::string serial) : SerialKey::SerialKey(std::string serial) :
m_userLimit(1), m_userLimit(1),
m_warnTime(0), m_warnTime(0),
m_expireTime(0), m_expireTime(0),
m_edition(kBasic), m_edition(kBasic),
m_trial(true), m_trial(true),
m_valid(false) m_valid(false)
{ {
string plainText = decode(serial); string plainText = decode(serial);
if (!plainText.empty()) { if (!plainText.empty()) {
parse(plainText); parse(plainText);
} }
if (!m_valid) { if (!m_valid) {
throw std::runtime_error ("Invalid serial key"); throw std::runtime_error ("Invalid serial key");
} }
@ -58,54 +58,54 @@ SerialKey::SerialKey(std::string serial) :
bool bool
SerialKey::isValid(time_t currentTime) const SerialKey::isValid(time_t currentTime) const
{ {
bool result = false; bool result = false;
if (m_valid) { if (m_valid) {
if (m_trial) { if (m_trial) {
if (currentTime < m_expireTime) { if (currentTime < m_expireTime) {
result = true; result = true;
} }
} }
else { else {
result = true; result = true;
} }
} }
return result; return result;
} }
bool bool
SerialKey::isExpiring(time_t currentTime) const SerialKey::isExpiring(time_t currentTime) const
{ {
bool result = false; bool result = false;
if (m_valid) { if (m_valid) {
if (m_warnTime <= currentTime && currentTime < m_expireTime) { if (m_warnTime <= currentTime && currentTime < m_expireTime) {
result = true; result = true;
} }
} }
return result; return result;
} }
bool bool
SerialKey::isExpired(time_t currentTime) const SerialKey::isExpired(time_t currentTime) const
{ {
bool result = false; bool result = false;
if (m_valid) { if (m_valid) {
if (m_expireTime <= currentTime) { if (m_expireTime <= currentTime) {
result = true; result = true;
} }
} }
return result; return result;
} }
bool bool
SerialKey::isTrial() const SerialKey::isTrial() const
{ {
return m_trial; return m_trial;
} }
Edition Edition
@ -135,7 +135,7 @@ hexEncode (std::string const& str) {
std::ostringstream oss; std::ostringstream oss;
for (size_t i = 0; i < str.size(); ++i) { for (size_t i = 0; i < str.size(); ++i) {
int c = str[i]; int c = str[i];
oss << std::setfill('0') << std::hex << std::setw(2) oss << std::setfill('0') << std::hex << std::setw(2)
<< std::uppercase; << std::uppercase;
oss << c; oss << c;
} }
@ -161,20 +161,20 @@ SerialKey::toString() const
time_t time_t
SerialKey::daysLeft(time_t currentTime) const SerialKey::daysLeft(time_t currentTime) const
{ {
unsigned long long timeLeft = 0; unsigned long long timeLeft = 0;
unsigned long long const day = 60 * 60 * 24; unsigned long long const day = 60 * 60 * 24;
if (currentTime < m_expireTime) { if (currentTime < m_expireTime) {
timeLeft = m_expireTime - currentTime; timeLeft = m_expireTime - currentTime;
} }
unsigned long long daysLeft = 0; unsigned long long daysLeft = 0;
daysLeft = timeLeft % day != 0 ? 1 : 0; daysLeft = timeLeft % day != 0 ? 1 : 0;
return timeLeft / day + daysLeft; return timeLeft / day + daysLeft;
} }
std::string std::string
SerialKey::email() const SerialKey::email() const
{ {
return m_email; return m_email;
@ -183,95 +183,95 @@ SerialKey::email() const
std::string std::string
SerialKey::decode(const std::string& serial) SerialKey::decode(const std::string& serial)
{ {
static const char* const lut = "0123456789ABCDEF"; static const char* const lut = "0123456789ABCDEF";
string output; string output;
size_t len = serial.length(); size_t len = serial.length();
if (len & 1) { if (len & 1) {
return output; return output;
} }
output.reserve(len / 2); output.reserve(len / 2);
for (size_t i = 0; i < len; i += 2) { for (size_t i = 0; i < len; i += 2) {
char a = serial[i]; char a = serial[i];
char b = serial[i + 1]; char b = serial[i + 1];
const char* p = std::lower_bound(lut, lut + 16, a); const char* p = std::lower_bound(lut, lut + 16, a);
const char* q = std::lower_bound(lut, lut + 16, b); const char* q = std::lower_bound(lut, lut + 16, b);
if (*q != b || *p != a) { if (*q != b || *p != a) {
return output; return output;
} }
output.push_back(static_cast<char>(((p - lut) << 4) | (q - lut))); output.push_back(static_cast<char>(((p - lut) << 4) | (q - lut)));
} }
return output; return output;
} }
void void
SerialKey::parse(std::string plainSerial) SerialKey::parse(std::string plainSerial)
{ {
string parityStart = plainSerial.substr(0, 1); string parityStart = plainSerial.substr(0, 1);
string parityEnd = plainSerial.substr(plainSerial.length() - 1, 1); string parityEnd = plainSerial.substr(plainSerial.length() - 1, 1);
m_valid = false; m_valid = false;
// check for parity chars { and }, record parity result, then remove them. // check for parity chars { and }, record parity result, then remove them.
if (parityStart == "{" && parityEnd == "}") { if (parityStart == "{" && parityEnd == "}") {
plainSerial = plainSerial.substr(1, plainSerial.length() - 2); plainSerial = plainSerial.substr(1, plainSerial.length() - 2);
// tokenize serialised subscription. // tokenize serialised subscription.
vector<string> parts; vector<string> parts;
std::string::size_type pos = 0; std::string::size_type pos = 0;
bool look = true; bool look = true;
while (look) { while (look) {
std::string::size_type start = pos; std::string::size_type start = pos;
pos = plainSerial.find(";", pos); pos = plainSerial.find(";", pos);
if (pos == string::npos) { if (pos == string::npos) {
pos = plainSerial.length(); pos = plainSerial.length();
look = false; look = false;
} }
parts.push_back(plainSerial.substr(start, pos - start)); parts.push_back(plainSerial.substr(start, pos - start));
pos += 1; pos += 1;
} }
if ((parts.size() == 8) if ((parts.size() == 8)
&& (parts.at(0).find("v1") != string::npos)) { && (parts.at(0).find("v1") != string::npos)) {
// e.g.: {v1;basic;Bob;1;email;company name;1398297600;1398384000} // e.g.: {v1;basic;Bob;1;email;company name;1398297600;1398384000}
m_edition = parseEdition(parts.at(1)); m_edition = parseEdition(parts.at(1));
m_name = parts.at(2); m_name = parts.at(2);
m_trial = false; m_trial = false;
sscanf(parts.at(3).c_str(), "%d", &m_userLimit); sscanf(parts.at(3).c_str(), "%d", &m_userLimit);
m_email = parts.at(4); m_email = parts.at(4);
m_company = parts.at(5); m_company = parts.at(5);
sscanf(parts.at(6).c_str(), "%lld", &m_warnTime); sscanf(parts.at(6).c_str(), "%lld", &m_warnTime);
sscanf(parts.at(7).c_str(), "%lld", &m_expireTime); sscanf(parts.at(7).c_str(), "%lld", &m_expireTime);
m_valid = true; m_valid = true;
} }
else if ((parts.size() == 9) else if ((parts.size() == 9)
&& (parts.at(0).find("v2") != string::npos)) { && (parts.at(0).find("v2") != string::npos)) {
// e.g.: {v2;trial;basic;Bob;1;email;company name;1398297600;1398384000} // e.g.: {v2;trial;basic;Bob;1;email;company name;1398297600;1398384000}
m_trial = parts.at(1) == "trial" ? true : false; m_trial = parts.at(1) == "trial" ? true : false;
m_edition = parseEdition(parts.at(2)); m_edition = parseEdition(parts.at(2));
m_name = parts.at(3); m_name = parts.at(3);
sscanf(parts.at(4).c_str(), "%d", &m_userLimit); sscanf(parts.at(4).c_str(), "%d", &m_userLimit);
m_email = parts.at(5); m_email = parts.at(5);
m_company = parts.at(6); m_company = parts.at(6);
sscanf(parts.at(7).c_str(), "%lld", &m_warnTime); sscanf(parts.at(7).c_str(), "%lld", &m_warnTime);
sscanf(parts.at(8).c_str(), "%lld", &m_expireTime); sscanf(parts.at(8).c_str(), "%lld", &m_expireTime);
m_valid = true; m_valid = true;
} }
} }
} }
Edition Edition
SerialKey::parseEdition(std::string const& editionStr) SerialKey::parseEdition(std::string const& editionStr)
{ {
Edition e = kBasic; Edition e = kBasic;
if (editionStr == "pro") { if (editionStr == "pro") {
e = kPro; e = kPro;
} }
return e; return e;
} }

76
src/lib/shared/SerialKey.h
View File

@ -26,65 +26,65 @@
#endif #endif
class SerialKey { class SerialKey {
friend bool operator== (SerialKey const&, SerialKey const&); friend bool operator== (SerialKey const&, SerialKey const&);
public: public:
explicit SerialKey(Edition edition = kUnregistered); explicit SerialKey(Edition edition = kUnregistered);
explicit SerialKey(std::string serial); explicit SerialKey(std::string serial);
bool isValid(time_t currentTime) const; bool isValid(time_t currentTime) const;
bool isExpiring(time_t currentTime) const; bool isExpiring(time_t currentTime) const;
bool isExpired(time_t currentTime) const; bool isExpired(time_t currentTime) const;
bool isTrial() const; bool isTrial() const;
time_t daysLeft(time_t currentTime) const; time_t daysLeft(time_t currentTime) const;
std::string email() const; std::string email() const;
Edition edition() const; Edition edition() const;
std::string toString() const; std::string toString() const;
static std::string decode(const std::string& serial); static std::string decode(const std::string& serial);
static Edition parseEdition(const std::string& editionStr); static Edition parseEdition(const std::string& editionStr);
private: private:
void parse(std::string plainSerial); void parse(std::string plainSerial);
std::string editionString() const; std::string editionString() const;
#ifdef TEST_ENV #ifdef TEST_ENV
private: private:
FRIEND_TEST(SerialKeyTests, decode_empty_returnEmptyString); FRIEND_TEST(SerialKeyTests, decode_empty_returnEmptyString);
FRIEND_TEST(SerialKeyTests, decode_invalidDigit_returnEmptyString); FRIEND_TEST(SerialKeyTests, decode_invalidDigit_returnEmptyString);
FRIEND_TEST(SerialKeyTests, decode_validSerial_returnPlainText); FRIEND_TEST(SerialKeyTests, decode_validSerial_returnPlainText);
FRIEND_TEST(SerialKeyTests, parse_noParty_invalid); FRIEND_TEST(SerialKeyTests, parse_noParty_invalid);
FRIEND_TEST(SerialKeyTests, parse_invalidPartsLenghth_invalid); FRIEND_TEST(SerialKeyTests, parse_invalidPartsLenghth_invalid);
FRIEND_TEST(SerialKeyTests, parse_validV1Serial_valid); FRIEND_TEST(SerialKeyTests, parse_validV1Serial_valid);
FRIEND_TEST(SerialKeyTests, parse_validV2Serial_valid); FRIEND_TEST(SerialKeyTests, parse_validV2Serial_valid);
#endif #endif
private: private:
std::string m_name; std::string m_name;
std::string m_email; std::string m_email;
std::string m_company; std::string m_company;
unsigned m_userLimit; unsigned m_userLimit;
unsigned long long m_warnTime; unsigned long long m_warnTime;
unsigned long long m_expireTime; unsigned long long m_expireTime;
Edition m_edition; Edition m_edition;
bool m_trial; bool m_trial;
bool m_valid; bool m_valid;
}; };
inline bool inline bool
operator== (SerialKey const& lhs, SerialKey const& rhs) { operator== (SerialKey const& lhs, SerialKey const& rhs) {
return (lhs.m_name == rhs.m_name) && return (lhs.m_name == rhs.m_name) &&
(lhs.m_email == rhs.m_email) && (lhs.m_email == rhs.m_email) &&
(lhs.m_company == rhs.m_company) && (lhs.m_company == rhs.m_company) &&
(lhs.m_userLimit == rhs.m_userLimit) && (lhs.m_userLimit == rhs.m_userLimit) &&
(lhs.m_warnTime == rhs.m_warnTime) && (lhs.m_warnTime == rhs.m_warnTime) &&
(lhs.m_expireTime == rhs.m_expireTime) && (lhs.m_expireTime == rhs.m_expireTime) &&
(lhs.m_edition == rhs.m_edition) && (lhs.m_edition == rhs.m_edition) &&
(lhs.m_trial == rhs.m_trial) && (lhs.m_trial == rhs.m_trial) &&
(lhs.m_valid == rhs.m_valid); (lhs.m_valid == rhs.m_valid);
} }
inline bool inline bool
operator!= (SerialKey const& lhs, SerialKey const& rhs) { operator!= (SerialKey const& lhs, SerialKey const& rhs) {
return !(lhs == rhs); return !(lhs == rhs);
} }