Merge remote-tracking branch 'origin/master' into finish-tests

2019-10-03 08:10:55 +02:00 · 2019-10-03 08:10:55 +02:00 · 3f57758510
commit 3f57758510
parent d16b8e67ba 9727c16add
5 changed files with 355 additions and 41 deletions
--- a/Insomnia_2019-10-01.yaml
+++ b/Insomnia_2019-10-01.yaml
@ -1,6 +1,6 @@
 _type: export
 __export_format: 4
-__export_date: 2019-10-01T12:26:42.443Z
+__export_date: 2019-10-01T14:13:03.279Z
 __export_source: insomnia.desktop.app:v6.6.2
 resources:
  - _id: req_f0797b6411b144f0bf0a40d9300ee92f
@ -25,7 +25,7 @@ resources:
    isPrivate: false
    metaSortKey: -1569905755136
    method: POST
-    modified: 1569931985286
+    modified: 1569934518963
    name: Login user
    parameters: []
    parentId: fld_9ef1d96e0e6d40ef9094250114269496
@ -58,7 +58,9 @@ resources:
    _type: workspace
  - _id: req_00f9f99d933c4638900385ffbbd4f8f7
    authentication:
-      token: cb50c0a8-9297-4369-85e5-2edf2715c8d4
+      disabled: false
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'never' %}"
      type: bearer
    body:
      mimeType: application/json
@ -72,7 +74,7 @@ resources:
    isPrivate: false
    metaSortKey: -1569905755134
    method: POST
-    modified: 1569932320745
+    modified: 1569937805044
    name: Get subjects
    parameters: []
    parentId: fld_2fb4c2cef1f44cff83d6b00fe0886384
@ -95,16 +97,26 @@ resources:
    _type: request_group
  - _id: req_9e42a5023f9d4235a5de099cd7573d2b
    authentication:
-      token: e3cabdeb-a883-48ff-93a0-a0290bc3fc2a
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'never' %}"
      type: bearer
-    body: {}
+    body:
+      mimeType: application/json
+      text: |-
+        {
+              "id": "1a23c502-1665-4492-94ea-039bb7505cae"
+        }
    created: 1569905755131
    description: ""
-    headers: []
+    headers:
+      - disabled: false
+        id: pair_e888b6c679d74b0988f0dd2d77690383
+        name: Content-Type
+        value: application/json
    isPrivate: false
    metaSortKey: -1569905755131
    method: POST
-    modified: 1569932279898
+    modified: 1569939013152
    name: Get Tokens
    parameters: []
    parentId: fld_36a4be72380440a0ace83ad508a0458d
@ -113,7 +125,7 @@ resources:
    settingRebuildPath: true
    settingSendCookies: true
    settingStoreCookies: true
-    url: "{{ base_url }}/TokenManager/getTokens"
+    url: "{{ base_url }}/TokenManager/getTokens/"
    _type: request
  - _id: fld_36a4be72380440a0ace83ad508a0458d
    created: 1569905755138
@ -121,35 +133,14 @@ resources:
    environment: {}
    environmentPropertyOrder: null
    metaSortKey: -1569905755138
-    modified: 1569905755138
-    name: token
+    modified: 1569934361048
+    name: Token Manager
    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
    _type: request_group
-  - _id: req_31d5f570d3c14ccaa66942104b425edf
-    authentication:
-      token: e3cabdeb-a883-48ff-93a0-a0290bc3fc2a
-      type: bearer
-    body: {}
-    created: 1569932671808
-    description: ""
-    headers: []
-    isPrivate: false
-    metaSortKey: -1569905755130.5
-    method: POST
-    modified: 1569932695037
-    name: Get Token Subject
-    parameters: []
-    parentId: fld_36a4be72380440a0ace83ad508a0458d
-    settingDisableRenderRequestBody: false
-    settingEncodeUrl: true
-    settingRebuildPath: true
-    settingSendCookies: true
-    settingStoreCookies: true
-    url: "{{ base_url }}/OpenManager/getTokenSubject"
-    _type: request
  - _id: req_4f99d61a83c14da29882cc80c07ddf54
    authentication:
-      token: e3cabdeb-a883-48ff-93a0-a0290bc3fc2a
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'never' %}"
      type: bearer
    body: {}
    created: 1569905755127
@ -158,7 +149,7 @@ resources:
    isPrivate: false
    metaSortKey: -1569905755129
    method: POST
-    modified: 1569932283290
+    modified: 1569938955854
    name: Set Tokens
    parameters: []
    parentId: fld_36a4be72380440a0ace83ad508a0458d
@ -169,6 +160,39 @@ resources:
    settingStoreCookies: true
    url: /TokenManager/setTokens
    _type: request
+  - _id: req_fd2e096f45554b46b31755564a0932bf
+    authentication:
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'never' %}"
+      type: bearer
+    body: {}
+    created: 1569934364782
+    description: ""
+    headers: []
+    isPrivate: false
+    metaSortKey: -1569905755130.5
+    method: POST
+    modified: 1569937740242
+    name: Get Token Subject
+    parameters: []
+    parentId: fld_8d34eca167ef426c8aa998c98bbe74e2
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: "{{ base_url }}/OpenManager/getTokenSubject"
+    _type: request
+  - _id: fld_8d34eca167ef426c8aa998c98bbe74e2
+    created: 1569934364777
+    description: Working with tokens ( keys )
+    environment: {}
+    environmentPropertyOrder: null
+    metaSortKey: -1569905755088
+    modified: 1569934370959
+    name: Open Manager
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: request_group
  - _id: env_7bc4918f1ec5467393a2ab36a460e4d0
    color: null
    created: 1569905755147
@ -189,14 +213,14 @@ resources:
        domain: 192.168.1.3
        hostOnly: true
        httpOnly: true
-        id: "6820483365057537"
+        id: "40058861704510274"
        key: JSESSIONID
-        lastAccessed: 2019-10-01T11:56:56.476Z
+        lastAccessed: 2019-10-01T14:08:27.635Z
        path: /
        secure: true
-        value: 825F318A0B50FCB64C295AD38164FA01
+        value: 2A63FF79AC604DB88D26DE41876B8B88
    created: 1569905764431
-    modified: 1569931016477
+    modified: 1569938907635
    name: Default Jar
    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
    _type: cookie_jar
@ -210,7 +234,7 @@ resources:
    dataPropertyOrder: null
    isPrivate: false
    metaSortKey: 1569905755144
-    modified: 1569905819689
-    name: OpenAPI env
+    modified: 1569935791597
+    name: colnod-test
    parentId: env_7bc4918f1ec5467393a2ab36a460e4d0
    _type: environment
--- a/Insomnia_2019-10-02.yaml
+++ b/Insomnia_2019-10-02.yaml
@ -0,0 +1,270 @@
+_type: export
+__export_format: 4
+__export_date: 2019-10-02T15:35:40.243Z
+__export_source: insomnia.desktop.app:v6.6.2
+resources:
+  - _id: req_f0797b6411b144f0bf0a40d9300ee92f
+    authentication:
+      disabled: false
+      password: E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0
+      type: basic
+      username: spaceti
+    body:
+      mimeType: application/json
+      text: >-
+        {
+          "username": "spaceti",
+          "password": "E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0"
+        }
+    created: 1569905755136
+    description: ""
+    headers:
+      - id: pair_061d15d1294e412caca8300559541695
+        name: content-type
+        value: application/json
+    isPrivate: false
+    metaSortKey: -1569905755136
+    method: POST
+    modified: 1570026752164
+    name: Login user
+    parameters: []
+    parentId: fld_9ef1d96e0e6d40ef9094250114269496
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: "{{ base_url }}/AaaManager/authSession"
+    _type: request
+  - _id: fld_9ef1d96e0e6d40ef9094250114269496
+    created: 1569905755142
+    description: Login information ( token )
+    environment: {}
+    environmentPropertyOrder: null
+    metaSortKey: -1569905755142
+    modified: 1569905755142
+    name: login
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: request_group
+  - _id: wrk_43652e59afaf4825a8bbbf31e346f616
+    created: 1569905755149
+    description: "Colnod system: [Product information](http://produkty.colsys.cz/colnod)
+      Jira issues: [Communicaiton with
+      Colnod](https://spaceti.atlassian.net/secure/RapidBoard.jspa?rapidView=78\
+      &projectKey=INT&modal=detail&selectedIssue=INT-3563)"
+    modified: 1569905755149
+    name: Colnod server 1.0.0
+    parentId: null
+    _type: workspace
+  - _id: req_00f9f99d933c4638900385ffbbd4f8f7
+    authentication:
+      disabled: false
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'no-history' %}"
+      type: bearer
+    body:
+      mimeType: application/json
+      text: ""
+    created: 1569905755134
+    description: ""
+    headers:
+      - id: pair_a2a3c43a20f64efbb8a4752c7e983c8e
+        name: Content-Type
+        value: application/json
+    isPrivate: false
+    metaSortKey: -1569905755134
+    method: POST
+    modified: 1570025488293
+    name: Get subjects
+    parameters: []
+    parentId: fld_2fb4c2cef1f44cff83d6b00fe0886384
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: "{{ base_url }}/SubjectManager/getSubjects"
+    _type: request
+  - _id: fld_2fb4c2cef1f44cff83d6b00fe0886384
+    created: 1569905755140
+    description: Operations about user
+    environment: {}
+    environmentPropertyOrder: null
+    metaSortKey: -1569905755140
+    modified: 1569905755140
+    name: user
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: request_group
+  - _id: req_9e42a5023f9d4235a5de099cd7573d2b
+    authentication:
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'never' %}"
+      type: bearer
+    body:
+      mimeType: application/json
+      text: ""
+    created: 1569905755131
+    description: ""
+    headers:
+      - disabled: false
+        id: pair_e888b6c679d74b0988f0dd2d77690383
+        name: Content-Type
+        value: application/json
+    isPrivate: false
+    metaSortKey: -1569905755131
+    method: POST
+    modified: 1569998661557
+    name: Get Tokens
+    parameters: []
+    parentId: fld_36a4be72380440a0ace83ad508a0458d
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: "{{ base_url }}/TokenManager/getTokens/"
+    _type: request
+  - _id: fld_36a4be72380440a0ace83ad508a0458d
+    created: 1569905755138
+    description: Working with tokens ( keys )
+    environment: {}
+    environmentPropertyOrder: null
+    metaSortKey: -1569905755138
+    modified: 1569934361048
+    name: Token Manager
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: request_group
+  - _id: req_4f99d61a83c14da29882cc80c07ddf54
+    authentication:
+      token: "{% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'never' %}"
+      type: bearer
+    body: {}
+    created: 1569905755127
+    description: ""
+    headers: []
+    isPrivate: false
+    metaSortKey: -1569905755129
+    method: POST
+    modified: 1569938955854
+    name: Set Tokens
+    parameters: []
+    parentId: fld_36a4be72380440a0ace83ad508a0458d
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: /TokenManager/setTokens
+    _type: request
+  - _id: req_fd2e096f45554b46b31755564a0932bf
+    authentication:
+      token:  {% response 'body', 'req_f0797b6411b144f0bf0a40d9300ee92f',
+        'b64::JC5pZA==::46b', 'no-history' %}
+      type: bearer
+    body: {}
+    created: 1569934364782
+    description: ""
+    headers: []
+    isPrivate: false
+    metaSortKey: -1569905755130.5
+    method: POST
+    modified: 1570028425988
+    name: Get Token Subject
+    parameters: []
+    parentId: fld_8d34eca167ef426c8aa998c98bbe74e2
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: "{{ base_url }}/OpenManager/getTokenSubject"
+    _type: request
+  - _id: fld_8d34eca167ef426c8aa998c98bbe74e2
+    created: 1569934364777
+    description: Working with tokens ( keys )
+    environment: {}
+    environmentPropertyOrder: null
+    metaSortKey: -1569905755088
+    modified: 1569934370959
+    name: Open Manager
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: request_group
+  - _id: req_7007bb1f6a0243a7b0568741f691f6d1
+    authentication:
+      disabled: false
+      password: E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0
+      type: basic
+      username: spaceti
+    body:
+      mimeType: application/json
+      text: >-
+        {
+          "username": "spaceti",
+          "password": "E7FEA07DBC82FB9BA34B2E453E2EFE89F0583E7187543507EF11E84726071FE428445372F2E46B455EB0C79747C51E362F403CE39473A2A8C2DFA0CE5C9826C0"
+        }
+    created: 1570025458784
+    description: ""
+    headers:
+      - id: pair_74b4df5d54d1446a90e6a668d373fb79
+        name: Content-Type
+        value: application/json
+    isPrivate: false
+    metaSortKey: -1569905755129.75
+    method: POST
+    modified: 1570030518745
+    name: Get Token Subject Full authorization
+    parameters: []
+    parentId: fld_8d34eca167ef426c8aa998c98bbe74e2
+    settingDisableRenderRequestBody: false
+    settingEncodeUrl: true
+    settingRebuildPath: true
+    settingSendCookies: true
+    settingStoreCookies: true
+    url: "{{ base_url }}/OpenManager/getTokenSubject"
+    _type: request
+  - _id: env_7bc4918f1ec5467393a2ab36a460e4d0
+    color: null
+    created: 1569905755147
+    data:
+      base_url: "{{ scheme }}://{{ host }}{{ base_path }}"
+    dataPropertyOrder:
+      "&":
+        - base_url
+    isPrivate: false
+    metaSortKey: 1569905755147
+    modified: 1569905805832
+    name: Base environment
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: environment
+  - _id: jar_61bbb3fdc5ee80a49ee817b3e5341053a6022960
+    cookies:
+      - creation: 2019-10-01T04:57:46.521Z
+        domain: 192.168.1.3
+        hostOnly: true
+        httpOnly: true
+        id: "9919962998126108"
+        key: JSESSIONID
+        lastAccessed: 2019-10-02T15:35:00.995Z
+        path: /
+        secure: true
+        value: D64B135F2F3D5103F02F0B9235B13722
+    created: 1569905764431
+    modified: 1570030500995
+    name: Default Jar
+    parentId: wrk_43652e59afaf4825a8bbbf31e346f616
+    _type: cookie_jar
+  - _id: env_92b9543a27e847689c951d1b1eeff229
+    color: "#cb5dc2"
+    created: 1569905755144
+    data:
+      base_path: /
+      host: 192.168.1.3:8443
+      scheme: https
+    dataPropertyOrder: null
+    isPrivate: false
+    metaSortKey: 1569905755144
+    modified: 1569935791597
+    name: colnod-test
+    parentId: env_7bc4918f1ec5467393a2ab36a460e4d0
+    _type: environment
--- a/curl/subjects.sh
+++ b/curl/subjects.sh
@ -0,0 +1,7 @@
+#!/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"]')
+
+
+curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/SubjectManager/getSubjects
--- a/curl/tokens.sh
+++ b/curl/tokens.sh
@ -0,0 +1,7 @@
+#!/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"]')
+
+
+curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/TokenManager/getTokens/
--- a/curl/tokenssubjects.sh
+++ b/curl/tokenssubjects.sh
@ -0,0 +1,6 @@
+#!/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"]')
+
+curl -kv -u "$TOKEN:" -X POST https://192.168.1.3:8443/OpenManager/getTokenSubject