postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-18 12:42:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow API key value to specified.

Browse Source
This commit is contained in:
kishorenc 2021-04-05 16:08:40 +05:30
parent 4b2beba0d9
commit ddf54cbd6e
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth_manager.cpp
View File

@ -324,6 +324,10 @@ Option<uint32_t> api_key_t::validate(const nlohmann::json &key_obj) {
}
}
if(key_obj.count("value") != 0 && !key_obj["value"].is_string()) {
return Option<uint32_t>(400, std::string("Key value must be a string."));
}
if(!key_obj["actions"].is_array() || key_obj["actions"].empty()) {
return Option<uint32_t>(400,"Wrong format for `actions`. It should be an array of string.");
}

5
src/core_api.cpp
View File

@ -945,12 +945,13 @@ bool post_create_key(const std::shared_ptr<http_req>& req, const std::shared_ptr
return false;
}
const std::string &rand_key = req->metadata;
if(req_json.count("expires_at") == 0) {
req_json["expires_at"] = api_key_t::FAR_FUTURE_TIMESTAMP;
}
const std::string &rand_key = (req_json.count("value") != 0) ?
req_json["value"].get<std::string>() : req->metadata;
api_key_t api_key(
rand_key,
req_json["description"].get<std::string>(),

11
test/auth_manager_test.cpp
View File

@ -390,4 +390,15 @@ TEST_F(AuthManagerTest, ValidateBadKeyProperties) {
validate_op = api_key_t::validate(key_obj2);
ASSERT_TRUE(validate_op.ok());
// check for valid value
nlohmann::json key_obj3;
key_obj3["description"] = "desc";
key_obj3["actions"] = {"*"};
key_obj3["collections"] = {"foobar"};
key_obj3["value"] = 100;
validate_op = api_key_t::validate(key_obj3);
ASSERT_FALSE(validate_op.ok());
ASSERT_STREQ("Key value must be a string.", validate_op.error().c_str());
}