View | Details | Raw Unified | Return to bug 22600
Collapse All | Expand All

(-)a/C4/Auth.pm (+6 lines)
Lines 1155-1160 sub checkauth { Link Here
1155
                    $session->param( 'emailaddress', $emailaddress );
1155
                    $session->param( 'emailaddress', $emailaddress );
1156
                    $session->param( 'ip',           $session->remote_addr() );
1156
                    $session->param( 'ip',           $session->remote_addr() );
1157
                    $session->param( 'lasttime',     time() );
1157
                    $session->param( 'lasttime',     time() );
1158
                    $session->param( 'interface',    $type);
1158
                    $session->param( 'shibboleth',   $shibSuccess );
1159
                    $session->param( 'shibboleth',   $shibSuccess );
1159
                    $debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map { $session->param($_) } qw(cardnumber firstname surname branch);
1160
                    $debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map { $session->param($_) } qw(cardnumber firstname surname branch);
1160
                }
1161
                }
Lines 1180-1185 sub checkauth { Link Here
1180
                $session->param( 'lasttime', time() );
1181
                $session->param( 'lasttime', time() );
1181
                $session->param( 'ip',       $session->remote_addr() );
1182
                $session->param( 'ip',       $session->remote_addr() );
1182
                $session->param( 'sessiontype', 'anon' );
1183
                $session->param( 'sessiontype', 'anon' );
1184
                $session->param( 'interface', $type);
1183
            }
1185
            }
1184
        }    # END if ( $q_userid
1186
        }    # END if ( $q_userid
1185
        elsif ( $type eq "opac" ) {
1187
        elsif ( $type eq "opac" ) {
Lines 1192-1197 sub checkauth { Link Here
1192
            $session->param( 'ip',          $session->remote_addr() );
1194
            $session->param( 'ip',          $session->remote_addr() );
1193
            $session->param( 'lasttime',    time() );
1195
            $session->param( 'lasttime',    time() );
1194
            $session->param( 'sessiontype', 'anon' );
1196
            $session->param( 'sessiontype', 'anon' );
1197
            $session->param( 'interface', $type);
1195
        }
1198
        }
1196
    }    # END unless ($userid)
1199
    }    # END unless ($userid)
1197
1200
Lines 1427-1432 sub check_api_auth { Link Here
1427
        my $session = get_session($sessionID);
1430
        my $session = get_session($sessionID);
1428
        C4::Context->_new_userenv($sessionID);
1431
        C4::Context->_new_userenv($sessionID);
1429
        if ($session) {
1432
        if ($session) {
1433
            C4::Context->interface($session->param('interface'));
1430
            C4::Context->set_userenv(
1434
            C4::Context->set_userenv(
1431
                $session->param('number'),       $session->param('id'),
1435
                $session->param('number'),       $session->param('id'),
1432
                $session->param('cardnumber'),   $session->param('firstname'),
1436
                $session->param('cardnumber'),   $session->param('firstname'),
Lines 1585-1590 sub check_api_auth { Link Here
1585
                $session->param( 'emailaddress', $emailaddress );
1589
                $session->param( 'emailaddress', $emailaddress );
1586
                $session->param( 'ip',           $session->remote_addr() );
1590
                $session->param( 'ip',           $session->remote_addr() );
1587
                $session->param( 'lasttime',     time() );
1591
                $session->param( 'lasttime',     time() );
1592
                $session->param( 'interface',    'api'  );
1588
            }
1593
            }
1589
            $session->param( 'cas_ticket', $cas_ticket);
1594
            $session->param( 'cas_ticket', $cas_ticket);
1590
            C4::Context->set_userenv(
1595
            C4::Context->set_userenv(
Lines 1674-1679 sub check_cookie_auth { Link Here
1674
    my $session   = get_session($sessionID);
1679
    my $session   = get_session($sessionID);
1675
    C4::Context->_new_userenv($sessionID);
1680
    C4::Context->_new_userenv($sessionID);
1676
    if ($session) {
1681
    if ($session) {
1682
        C4::Context->interface($session->param('interface'));
1677
        C4::Context->set_userenv(
1683
        C4::Context->set_userenv(
1678
            $session->param('number'),       $session->param('id'),
1684
            $session->param('number'),       $session->param('id'),
1679
            $session->param('cardnumber'),   $session->param('firstname'),
1685
            $session->param('cardnumber'),   $session->param('firstname'),
(-)a/C4/Context.pm (-1 / +6 lines)
Lines 1028-1034 sub interface { Link Here
1028
1028
1029
    if (defined $interface) {
1029
    if (defined $interface) {
1030
        $interface = lc $interface;
1030
        $interface = lc $interface;
1031
        if ($interface eq 'opac' || $interface eq 'intranet' || $interface eq 'sip' || $interface eq 'commandline') {
1031
        if (   $interface eq 'api'
1032
            || $interface eq 'opac'
1033
            || $interface eq 'intranet'
1034
            || $interface eq 'sip'
1035
            || $interface eq 'commandline' )
1036
        {
1032
            $context->{interface} = $interface;
1037
            $context->{interface} = $interface;
1033
        } else {
1038
        } else {
1034
            warn "invalid interface : '$interface'";
1039
            warn "invalid interface : '$interface'";
(-)a/Koha/REST/V1/Auth.pm (-1 / +2 lines)
Lines 157-162 sub authenticate_api_request { Link Here
157
        if ($valid_token) {
157
        if ($valid_token) {
158
            my $patron_id = Koha::ApiKeys->find( $valid_token->{client_id} )->patron_id;
158
            my $patron_id = Koha::ApiKeys->find( $valid_token->{client_id} )->patron_id;
159
            $user         = Koha::Patrons->find($patron_id);
159
            $user         = Koha::Patrons->find($patron_id);
160
            C4::Context->interface('api');
160
        }
161
        }
161
        else {
162
        else {
162
            # If we have "Authorization: Bearer" header and oauth authentication
163
            # If we have "Authorization: Bearer" header and oauth authentication
Lines 173-178 sub authenticate_api_request { Link Here
173
            );
174
            );
174
        }
175
        }
175
        $user = $c->_basic_auth( $authorization_header );
176
        $user = $c->_basic_auth( $authorization_header );
177
        C4::Context->interface('api');
176
        unless ( $user ) {
178
        unless ( $user ) {
177
            # If we have "Authorization: Basic" header and authentication
179
            # If we have "Authorization: Basic" header and authentication
178
            # failed, do not try other authentication means
180
            # failed, do not try other authentication means
179
- 

Return to bug 22600