Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RBAC checking via custom authHandler function + SAF query interpretation #281

Open
wants to merge 82 commits into
base: v1.x/staging
Choose a base branch
from
Open

RBAC checking via custom authHandler function + SAF query interpretation #281

wants to merge 82 commits into from

Commits on Apr 13, 2021

  1. Initial commit for SAF query interpretation methods 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    3a8e00b View commit details
    Browse the repository at this point in the history

  2. Increase buffer size for subUrl 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    94742a0 View commit details
    Browse the repository at this point in the history

  3. Changed buffer size for some other strings 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    278dc2b View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2021

  1. Code review comments regarding NULL & buffer size 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    35fe4be View commit details
    Browse the repository at this point in the history

  2. Added safeMalloc 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    f4fb448 View commit details
    Browse the repository at this point in the history

  3. strcpy -> snprintf to avoid possible overflow 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    9a191ad View commit details
    Browse the repository at this point in the history

  4. Increased buffer for some variables 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    2b271d7 View commit details
    Browse the repository at this point in the history

  5. sprintf --> snprintf to avoid overflow 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    40c0770 View commit details
    Browse the repository at this point in the history

  6. Small typo 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    7df8380 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2021

  1. Changed snprintf method usage 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    21eb96d View commit details
    Browse the repository at this point in the history

  2. Revert 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    038b915 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2021

  1. Addressed more code review like NULL checks 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    0d154ad View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. Some prototype RBAC checking + unfinished comments 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 24, 2021
    Configuration menu
    Copy the full SHA
    c91b2dc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' of github.com:zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 24, 2021
    Configuration menu
    Copy the full SHA
    54a35c5 View commit details
    Browse the repository at this point in the history

  3. Annoying char change 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 24, 2021
    Configuration menu
    Copy the full SHA
    a618f31 View commit details
    Browse the repository at this point in the history

  4. Updated dep 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 24, 2021
    Configuration menu
    Copy the full SHA
    a6ef66e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Added check for rbac: true | false 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 25, 2021
    Configuration menu
    Copy the full SHA
    245cdbc View commit details
    Browse the repository at this point in the history

  2. Merge github.com:zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 25, 2021
    Configuration menu
    Copy the full SHA
    98cd911 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. Updated zowe-common-c 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed May 31, 2021
    Configuration menu
    Copy the full SHA
    a7a4e1e View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Moved core RBAC auth logic from zowe-common-c into ZSS 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    b0f8914 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' of https://github.com/zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    2b55af4 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2021

  1. Fixed merge conflicts 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 5, 2021
    Configuration menu
    Copy the full SHA
    63ce32f View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Updated zowe-common-c 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    a132c8b View commit details
    Browse the repository at this point in the history

  2. Changed authType to string 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    0c1b0f5 View commit details
    Browse the repository at this point in the history

  3. Missed a few things 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    4c50186 View commit details
    Browse the repository at this point in the history

  4. Removed comments 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    8da7246 View commit details
    Browse the repository at this point in the history

  5. Updated zowe-common-c 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    f11219f View commit details
    Browse the repository at this point in the history

  6. Removed leftover comments 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    efde2a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. Code review adjustments from Irek 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    0add3ec View commit details
    Browse the repository at this point in the history

  2. Don't use URL query params in SAF query 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    3eaf7a0 View commit details
    Browse the repository at this point in the history

  3. Changed #define value name to be more relevant 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    f35aa89 View commit details
    Browse the repository at this point in the history

  4. Rename 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    357f0d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. Removed regEx to use parsedFile instead 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    06a16ef View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Re-added bypass services for NO RBAC 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    86ee872 View commit details
    Browse the repository at this point in the history

  2. Removed comments + clean up unused variables 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    21b1496 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2021

  1. Some code cleanup 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jun 20, 2021
    Configuration menu
    Copy the full SHA
    970cd23 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Address code review 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    8a7ad43 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. More code cleanup 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    60f1e4c View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. Respect env variable for RBAC too 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    4beeca2 View commit details
    Browse the repository at this point in the history

  2. Added some useful debug logging 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    c537201 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' of https://github.com/zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    371319a View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Remove mistakenly added file 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    a9f1ed1 View commit details
    Browse the repository at this point in the history

  2. Update pointer to zowe-common-c 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    7840318 View commit details
    Browse the repository at this point in the history

  3. Remove SERVICE_AUTH_NATIVE_WITH_SESSION_TOKEN_NO_RBAC 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    954f921 View commit details
    Browse the repository at this point in the history

  4. Refactor authorization code 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    11ff99f View commit details
    Browse the repository at this point in the history

  5. Register RBAC handler only if RBAC enabled 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    9590ce1 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Refactoring + use rbacAuthorization only when username is on request 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    ac967f2 View commit details
    Browse the repository at this point in the history

  2. Detect ZOWE_INSTANCE 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    5ade5c9 View commit details
    Browse the repository at this point in the history

  3. Fix username check 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    ef8b441 View commit details
    Browse the repository at this point in the history

  4. Rafactor SAF profile check 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    ef78692 View commit details
    Browse the repository at this point in the history

  5. ServerStatusServer has respect ZWED_dataserviceAuthentication_rbac en… 

    …v var

Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    894bc65 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. Minor fixes 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    f0d839a View commit details
    Browse the repository at this point in the history

  2. Update pointer to zowe-common-c 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    5f4f553 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2021

  1. Add const for getProfileNameFromRequest args 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    f9e437d View commit details
    Browse the repository at this point in the history

  2. Add profileNameBufSize arg 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    1a63674 View commit details
    Browse the repository at this point in the history

  3. Add const for arguments 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    961b7a7 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. Merge pull request #310 from lchudinov/rbac-code-cleanup 

    Rbac code cleanup
    @DivergentEuropeans
    DivergentEuropeans authored Aug 19, 2021
    Configuration menu
    Copy the full SHA
    f774e80 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' of github.com:zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    a4ad82a View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2021

  1. Updated with more of Irek's suggested code changes 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    f3b8d91 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. Merge branch 'refactor-rbac-code' of https://github.com/lchudinov/zss … 

    …into RBAC-support

Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    ddf0408 View commit details
    Browse the repository at this point in the history

  2. Removed 'class' as an arg 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    e2ed56e View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2021

  1. Merge branch 'staging' of github.com:zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Aug 29, 2021
    Configuration menu
    Copy the full SHA
    47a8af9 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2021

  1. PassTicket REST API skeleton 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    4fc145c View commit details
    Browse the repository at this point in the history

  2. Implement PassTicket generation 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    542f458 View commit details
    Browse the repository at this point in the history

  3. Refactoring for PassTicket 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    414466c View commit details
    Browse the repository at this point in the history

  4. Add passTicketService.c to build_zss.sh 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    ad39d3b View commit details
    Browse the repository at this point in the history

  5. Update Changelog 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    3b10697 View commit details
    Browse the repository at this point in the history

  6. Cleanup includes 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    918bf99 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/passticket-service' of https://github.com/lchud… 

    …inov/zss into RBAC-support
    @DivergentEuropeans
    DivergentEuropeans committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    6b1f6b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. Disable RBAC authorization for saf-auth service 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    b83e85e View commit details
    Browse the repository at this point in the history

  2. Update pointer to zowe-common-c 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    42acd8e View commit details
    Browse the repository at this point in the history

  3. Update pointer to zowe-common-c 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    a4b56df View commit details
    Browse the repository at this point in the history

  4. Merge pull request #331 from lchudinov/feature/disable-rbac-authoriza… 

    …tion-for-saf-auth-service

Disable RBAC authorization for saf-auth service
    @lchudinov
    lchudinov authored Aug 31, 2021
    Configuration menu
    Copy the full SHA
    909ecb2 View commit details
    Browse the repository at this point in the history

  5. Fix buffer size 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    0899ef7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #332 from lchudinov/bugfix/fix-buffer-size 

    Fix buffer size
    @lchudinov
    lchudinov authored Aug 31, 2021
    Configuration menu
    Copy the full SHA
    7c6cd42 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Updated zowe-common-c 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    acf074c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'RBAC-support' of github.com:zowe/zss into RBAC-support

    @DivergentEuropeans
    DivergentEuropeans committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    46e527d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' of github.com:zowe/zss into RBAC-support 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    ea23113 View commit details
    Browse the repository at this point in the history

  4. Updated zowe-common-c 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    65e909e View commit details
    Browse the repository at this point in the history

  5. Small changelog typo 

    Signed-off-by: Leanid Astrakou <[email protected]>
    @DivergentEuropeans
    DivergentEuropeans committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    6a66374 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. Merge remote-tracking branch 'origin/staging' into RBAC-support

    Leonty Chudinov committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    47b6665 View commit details
    Browse the repository at this point in the history

  2. Adderss code review 

    Signed-off-by: Leonty Chudinov <[email protected]>
    Leonty Chudinov committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    8160346 View commit details
    Browse the repository at this point in the history