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.

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

[GenericInterface] 2FA was added #502

Merged
merged 19 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f44ff91
[GenericInterface] 2FA was added
CallMeFlanby Sep 22, 2023
4653f07
Merge pull request #1 from CallMeFlanby/issue/GenericInterface_added_2FA
CallMeFlanby Sep 22, 2023
bbd9eb5
Merge branch 'dev' into dev
CallMeFlanby Sep 23, 2023
582d87e
Merge branch 'dev' into dev
CallMeFlanby Sep 29, 2023
02d9a7c
Merge branch 'dev' into dev
CallMeFlanby Oct 5, 2023
0c21718
Merge branch 'znuny:dev' into dev
CallMeFlanby Oct 16, 2023
7108c78
Added optional usage of HTTP header
CallMeFlanby Oct 16, 2023
c1ec3cf
Merge branch 'dev' into GenericInterface_added_2FA
dennykorsukewitz Oct 18, 2023
fdcfee1
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Oct 23, 2023
e4ea665
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Nov 9, 2023
415d07b
Merge branch 'dev' into GenericInterface_added_2FA
dennykorsukewitz Nov 23, 2023
814a301
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Dec 1, 2023
a8235f5
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Jan 16, 2024
02eb3c6
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Jan 30, 2024
fdad251
Merge branch 'dev' into GenericInterface_added_2FA
dennykorsukewitz Feb 6, 2024
a3832d5
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Feb 8, 2024
61aabac
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Mar 26, 2024
9d5291e
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Apr 4, 2024
1158a35
Merge branch 'dev' into GenericInterface_added_2FA
CallMeFlanby Apr 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Kernel/GenericInterface/Operation/Session/Common.pm
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ sub CreateSessionID {
my $User;
my %UserData;
my $UserType;

# get params
my $PostPw = $Param{Data}->{Password} || '';
my $PostTwoFactorToken = $Param{Data}->{TwoFactorToken} || '';

if ( defined $Param{Data}->{UserLogin} && $Param{Data}->{UserLogin} ) {

Expand All @@ -59,6 +60,7 @@ sub CreateSessionID {
$User = $Kernel::OM->Get('Kernel::System::Auth')->Auth(
User => $PostUser,
Pw => $PostPw,
TwoFactorToken => $PostTwoFactorToken,
);
%UserData = $Kernel::OM->Get('Kernel::System::User')->GetUserData(
User => $User,
Expand All @@ -75,6 +77,7 @@ sub CreateSessionID {
$User = $Kernel::OM->Get('Kernel::System::CustomerAuth')->Auth(
User => $PostUser,
Pw => $PostPw,
TwoFactorToken => $PostTwoFactorToken,
);
%UserData = $Kernel::OM->Get('Kernel::System::CustomerUser')->CustomerUserDataGet(
User => $PostUser,
Expand Down
1 change: 1 addition & 0 deletions Kernel/GenericInterface/Transport/HTTP/REST.pm
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ sub ProviderProcessRequest {
HTTP_X_OTRS_HEADER_SESSIONID => 'SessionID',
HTTP_X_OTRS_HEADER_PASSWORD => 'Password',
HTTP_X_OTRS_HEADER_IMPERSONATEASUSER => 'ImpersonateAsUser',
HTTP_X_OTRS_HEADER_TWOFACTORTOKEN => 'TwoFactorToken',
);

HEADER:
Expand Down
Loading