WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-11 20:27:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed workspace error in REST API

Browse Source 
Signed-off-by: Leonid Kaganov <lleo@lleo.me>
This commit is contained in:
Leonid Kaganov
2025-09-15 21:49:41 +03:00
parent 4bd387b8bb
commit d749af78b5
4 changed files with 168 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/TEST00.sh
Executable
+151
View File
@@ -0,0 +1,151 @@
#!/bin/bash
clear
source ./pulse_lib.sh
TOKEN=$(./token.sh claims.json)
get "00000000-0000-0000-0000-000000000001/foo/bar1"
put "00000000-0000-0000-0000-000000000001/foo/bar1" "rediska"
get "00000000-0000-0000-0000-000000000001/foo/bar1"
exit
#echo ${TOKEN}
#exit
ZP="00000000-0000-0000-0000-000000000001/TESTS"
put "00000000-0000-0000-0000-000000000001/TESTS/val1" "value" "HULY-TTL: 1"
put "00000000-0000-0000-0000-000000000001/TESTS/val2" "value" "HULY-TTL: 12"
put "00000000-0000-0000-0000-000000000001/TESTS/val3" "value" "HULY-TTL: 1"
get "00000000-0000-0000-0000-000000000001/TESTS/"
sleep 2
# get "00000000-0000-0000-0000-000000000001/TESTS/val2"
get "00000000-0000-0000-0000-000000000001/TESTS/"
exit
put "00000000-0000-0000-0000-000000000001/TESTS" "Value"
#exit
delete "00000000-0000-0000-0000-000000000001/TESTS"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value"
delete "00000000-0000-0000-0000-000000000001/TESTS" "If-Match: *"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value"
delete "00000000-0000-0000-0000-000000000001/TESTS" "If-Match: dd358c74cb9cb897424838fbcb69c933"
#exit
put "00000000-0000-0000-0000-000000000001/TESTS" "Value" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/1" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/2" "Value_2" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/2/$/secret" "Value_secret" "HULY-TTL: 2"
get "00000000-0000-0000-0000-000000000001/TESTS/"
#exit
delete "0000000/TESTS"
delete ${ZP}
put ${ZP} "Value_1" "HULY-TTL: 2"
delete ${ZP}
echo "--------- authorization_test ----------"
TOKEN=""
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_1" "HULY-TTL: 2"
TOKEN=$(./token.sh claims_system.json)
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_1" "HULY-TTL: 2"
TOKEN=$(./token.sh claims_wrong_ws.json)
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_1" "HULY-TTL: 2"
TOKEN=$(./token.sh claims.json)
put "00000000-0000-0000-0000-000000000002/TESTS" "Value_1" "HULY-TTL: 2"
echo "--------- if-match ----------"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/1" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/2" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/3$" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/3/secret$/4" "Value_1" "HULY-TTL: 2"
get "00000000-0000-0000-0000-000000000001/TESTS"
get "00000000-0000-0000-0000-000000000001/TESTS/"
get "00000000-0000-0000-0000-000000000001/TESTS/3/secret$/"
echo "--------- Deprecated symbols ----------"
put "00000000-0000-0000-0000-000000000001/'TESTS" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TES?TS" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS*" "Value_1" "HULY-TTL: 2"
put "00000000-0000-0000-0000-000000000001/TESTS/" "Value_1" "HULY-TTL: 2"
echo "--------- if-match ----------"
delete ${ZP}
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_1" "HULY-TTL: 1" "If-Match: *"
get ${ZP}
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_2" "HULY-TTL: 1"
get ${ZP}
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_3" "HULY-TTL: 1" "If-Match: dd358c74cb9cb897424838fbcb69c933"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_4" "HULY-TTL: 1" "If-Match: *"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_5" "HULY-TTL: 1" "If-Match: c7bcabf6b98a220f2f4888a18d01568d"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_6" "HULY-TTL: 1" "If-None-Match: *"
echo "-- Expected OK: 201 Created (key was not exist)"
put ${ZP} "enother text" "If-None-Match" "*"
put ${ZP} "some text"
echo "-- Expected Error: 412 Precondition Failed (key was exist)"
put ${ZP} "enother text" "If-None-Match" "*"
echo "================> UPDATE PUT If-Match"
get ${ZP}
echo "-- Expected OK: 204 No Content (right hash)"
put ${ZP} "some text" "If-Match" "552e21cd4cd9918678e3c1a0df491bc3"
get ${ZP}
echo "-- Expected OK: 204 No Content (hash still right)"
put ${ZP} "enother version" "If-Match" "552e21cd4cd9918678e3c1a0df491bc3"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_1" "HULY-TTL: 3"
echo "sleep 1 sec"
sleep 1
get "00000000-0000-0000-0000-000000000001/TESTS"
echo "sleep 3 sec"
sleep 2
get "00000000-0000-0000-0000-000000000001/TESTS"
echo "--------- delete ----------"
put "00000000-0000-0000-0000-000000000001/TESTS" "Value_2" "HULY-TTL: 3"
get "00000000-0000-0000-0000-000000000001/TESTS"
delete "00000000-0000-0000-0000-000000000001/TESTS"
get "00000000-0000-0000-0000-000000000001/TESTS"
echo "--------- prefix ----------"
put "00000000-0000-0000-0000-000000000001/TESTS1" "Value_1" "HULY-TTL: 3"
put "00000000-0000-0000-0000-000000000001/TESTS2" "Value_1" "HULY-TTL: 3"
put "00000000-0000-0000-0000-000000000001/HREST2" "Value_1" "HULY-TTL: 3"
get "00000000-0000-0000-0000-000000000001?prefix=TES"
sleep 1
get "00000000-0000-0000-0000-000000000001?prefix="
exit
src/config/default.toml
+1 -1
View File
@@ -12,7 +12,7 @@ max_ttl = 3600
backend = "redis"
no_authorization = false
heartbeat_timeout = 30
heartbeat_timeout = 90
# optional settings
# max_size = 100
src/db.rs
+7
View File
@@ -77,6 +77,13 @@ impl Db {
ttl: Option<Ttl>,
mode: Option<SaveMode>,
) -> redis::RedisResult<()> {
println!(
"Db::save key=[{}] value=[{:?}] mode=[{:?}]",
key,
value.as_ref(),
mode
);
match &self.inner {
DbInner::Memory(m) => {
memory_save(m, key, value.as_ref(), ttl, mode).await?;
src/handlers_http.rs
+9 -8
View File
@@ -48,6 +48,7 @@ pub fn map_handler_error(err: impl std::fmt::Display) -> Error {
#[derive(Deserialize, Debug)]
pub struct PathParams {
key: String,
workspace: String,
}
/// list
@@ -55,8 +56,8 @@ pub async fn list(
path: web::Path<PathParams>,
db: web::Data<Db>,
) -> Result<HttpResponse, actix_web::Error> {
let key = path.into_inner().key;
let params = path.into_inner();
let key = format!("{}/{}", &params.workspace, &params.key);
trace!(key, "list request");
async move || -> anyhow::Result<HttpResponse> {
@@ -72,8 +73,8 @@ pub async fn get(
path: web::Path<PathParams>,
db: web::Data<Db>,
) -> Result<HttpResponse, actix_web::error::Error> {
let key = path.into_inner().key;
let params = path.into_inner();
let key = format!("{}/{}", &params.workspace, &params.key);
trace!(key, "get request");
async move || -> anyhow::Result<HttpResponse> {
@@ -97,8 +98,8 @@ pub async fn put(
body: web::Bytes,
db: web::Data<Db>,
) -> Result<HttpResponse, actix_web::error::Error> {
let key: String = path.into_inner().key;
let params = path.into_inner();
let key = format!("{}/{}", &params.workspace, &params.key);
trace!(key, "put request");
async move || -> anyhow::Result<HttpResponse> {
@@ -157,8 +158,8 @@ pub async fn delete(
path: web::Path<PathParams>,
db: web::Data<Db>,
) -> Result<HttpResponse, actix_web::error::Error> {
let key: String = path.into_inner().key;
let params = path.into_inner();
let key = format!("{}/{}", &params.workspace, &params.key);
trace!(key, "delete request");
async move || -> anyhow::Result<HttpResponse> {