Merge branch 'master' into test-lineending

# Conflicts:
#	src/app/app.pro
#	src/colnod/colnod.pri
#	src/colnod/databasemanager.cpp
#	src/colnod/databasemanager.h
#	src/colnod/datamanager.cpp
#	src/colnod/datamanager.h
#	src/colnod/entity.h
#	src/colnod/requestmanager.cpp
#	src/colnod/subject.h
#	src/colnod/syncmanager.h
#	src/colnod/token.h
#	test/unitTests/unitTests.pro
This commit is contained in:
Filip Bucek 2019-11-08 11:29:40 +01:00
commit 2d03f742bb
5 changed files with 57 additions and 57 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
TOKEN=$(curl -k --user "spaceti:E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0" -d '{"password":"E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0","username":"spaceti"}' -H "Content-Type: application/json" https://192.168.1.3:8443/AaaManager/authSession 2>/dev/null | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["id"]') TOKEN=$(curl -k --user "spaceti:E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0" -d '{"password":"E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0","username":"spaceti"}' -H "Content-Type: application/json" https://192.168.1.3:8443/AaaManager/authSession 2>/dev/null | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["id"]')
curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/SubjectManager/getSubjects curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/SubjectManager/getSubjects

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
TOKEN=$(curl -k --user "spaceti:E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0" -d '{"password":"E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0","username":"spaceti"}' -H "Content-Type: application/json" https://192.168.1.3:8443/AaaManager/authSession 2>/dev/null | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["id"]') TOKEN=$(curl -k --user "spaceti:E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0" -d '{"password":"E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0","username":"spaceti"}' -H "Content-Type: application/json" https://192.168.1.3:8443/AaaManager/authSession 2>/dev/null | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["id"]')
curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/TokenManager/getTokens/ curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/TokenManager/getTokens/

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
TOKEN=$(curl -k --user "spaceti:E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0" -d '{"password":"E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0","username":"spaceti"}' -H "Content-Type: application/json" https://192.168.1.3:8443/AaaManager/authSession 2>/dev/null | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["id"]') TOKEN=$(curl -k --user "spaceti:E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0" -d '{"password":"E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0","username":"spaceti"}' -H "Content-Type: application/json" https://192.168.1.3:8443/AaaManager/authSession 2>/dev/null | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["id"]')
echo TOKEN echo TOKEN
curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/OpenManager/getTokenSubject curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/OpenManager/getTokenSubject

View File

@ -1,34 +1,34 @@
{ {
"items": [ "items": [
{ {
"id": "582c982d-6fd7-4856-8548-7ce542791c7a", "id": "582c982d-6fd7-4856-8548-7ce542791c7a",
"name": "test", "name": "test",
"description": "mobile", "description": "mobile",
"tokenType": "Token", "tokenType": "Token",
"tokenBits": 32, "tokenBits": 32,
"tokenData": "7B9D32", "tokenData": "7B9D32",
"timeToLive": 255, "timeToLive": 255,
"authErrors": 255, "authErrors": 255,
"flags": [ "flags": [
"Enabled", "Enabled",
"NoValidity" "NoValidity"
], ],
"subjectId": "72b37f7e-5761-4e6c-8e87-20c0bed0d904" "subjectId": "72b37f7e-5761-4e6c-8e87-20c0bed0d904"
}, },
{ {
"id": "3ff23b41-3da3-4b33-82ce-d8e2d8c9a546", "id": "3ff23b41-3da3-4b33-82ce-d8e2d8c9a546",
"name": "test1", "name": "test1",
"description": "mobile", "description": "mobile",
"tokenType": "Token", "tokenType": "Token",
"tokenBits": 32, "tokenBits": 32,
"tokenData": "7B9D12", "tokenData": "7B9D12",
"timeToLive": 255, "timeToLive": 255,
"authErrors": 255, "authErrors": 255,
"flags": [ "flags": [
"Enabled", "Enabled",
"NoValidity" "NoValidity"
], ],
"subjectId": "72b37f7e-5761-4e6c-8e87-20c0bed0d904" "subjectId": "72b37f7e-5761-4e6c-8e87-20c0bed0d904"
} }
] ]
} }

View File

@ -1,5 +1,5 @@
{ {
"host": "https://192.168.1.3:8443", "host": "https://192.168.1.3:8443",
"username": "spaceti", "username": "spaceti",
"password": "spaceti1" "password": "spaceti1"
} }