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

(-)a/C4/Auth.pm (-1 / +25 lines)
Lines 39-44 use Koha::Patrons; Link Here
39
use POSIX qw/strftime/;
39
use POSIX qw/strftime/;
40
use List::MoreUtils qw/ any /;
40
use List::MoreUtils qw/ any /;
41
use Encode qw( encode is_utf8);
41
use Encode qw( encode is_utf8);
42
use Net::CIDR;
42
43
43
# use utf8;
44
# use utf8;
44
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout $shib $shib_login);
45
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout $shib $shib_login);
Lines 55-61 BEGIN { Link Here
55
    @ISA       = qw(Exporter);
56
    @ISA       = qw(Exporter);
56
    @EXPORT    = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
57
    @EXPORT    = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
57
    @EXPORT_OK = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash
58
    @EXPORT_OK = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash
58
      &get_all_subpermissions &get_user_subpermissions
59
      &get_all_subpermissions &get_user_subpermissions &in_ipset
59
    );
60
    );
60
    %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
61
    %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
61
    $ldap      = C4::Context->config('useldapserver') || 0;
62
    $ldap      = C4::Context->config('useldapserver') || 0;
Lines 2106-2111 sub haspermission { Link Here
2106
    #FIXME - This fcn should return the failed permission so a suitable error msg can be delivered.
2107
    #FIXME - This fcn should return the failed permission so a suitable error msg can be delivered.
2107
}
2108
}
2108
2109
2110
=head2 in_ipset
2111
2112
  $flags = ($ipset);
2113
2114
C<$ipset> A space separated string describing an IP set. Can include single IPs or ranges
2115
2116
Returns 1 if the remote address is in the provided ipset, or 0 otherwise.
2117
2118
=cut
2119
2120
sub in_ipset {
2121
 my ($ipset) = @_;
2122
 my @allowedipranges = split(' ', $ipset);
2123
 if (scalar @allowedipranges > 0) {
2124
    my @rangelist;
2125
    eval { @rangelist = Net::CIDR::range2cidr(@allowedipranges); }; return 0 if $@;
2126
    unless (Net::CIDR::cidrlookup($ENV{'REMOTE_ADDR'}, @rangelist)) {
2127
      return 0;
2128
    }
2129
 }
2130
 return 1;
2131
}
2132
2109
sub getborrowernumber {
2133
sub getborrowernumber {
2110
    my ($userid) = @_;
2134
    my ($userid) = @_;
2111
    my $userenv = C4::Context->userenv;
2135
    my $userenv = C4::Context->userenv;
(-)a/C4/Installer/PerlDependencies.pm (+5 lines)
Lines 802-807 our $PERL_DEPS = { Link Here
802
        'required' => '0',
802
        'required' => '0',
803
        'min_ver'  => '0.56',
803
        'min_ver'  => '0.56',
804
    },
804
    },
805
    'Net::CIDR'    => {
806
        'usage'    => 'Core',
807
        'required' => '1',
808
        'min_ver'  => '0.15',
809
    },
805
    'Net::SFTP::Foreign' => {
810
    'Net::SFTP::Foreign' => {
806
        'usage'    => 'Edifact',
811
        'usage'    => 'Edifact',
807
        'required' => '0',
812
        'required' => '0',
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 481-486 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
481
('SearchEngine','Zebra','Elasticsearch|Zebra','Search Engine','Choice'),
481
('SearchEngine','Zebra','Elasticsearch|Zebra','Search Engine','Choice'),
482
('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
482
('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
483
('SearchWithISBNVariations','0',NULL,'If enabled, search on all variations of the ISBN','YesNo'),
483
('SearchWithISBNVariations','0',NULL,'If enabled, search on all variations of the ISBN','YesNo'),
484
('SelfCheckAllowByIPRanges','',NULL,'(Leave blank if not used. Use ranges or simple ip addresses separated by spaces, like <code>192.168.1.1 192.168.0.0/24</code>.)','Short'),
484
('SelfCheckHelpMessage','','70|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
485
('SelfCheckHelpMessage','','70|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
485
('SelfCheckInMainUserBlock','','70|10','Add a block of HTML that will display on the self check-in screen.','Textarea'),
486
('SelfCheckInMainUserBlock','','70|10','Add a block of HTML that will display on the self check-in screen.','Textarea'),
486
('SelfCheckInModule', 0, NULL, 'Enable the standalone self-checkin module.', 'YesNo'),
487
('SelfCheckInModule', 0, NULL, 'Enable the standalone self-checkin module.', 'YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+4 lines)
Lines 876-881 Circulation: Link Here
876
                  yes: Show
876
                  yes: Show
877
                  no: "Don't show"
877
                  no: "Don't show"
878
            - "the print receipt popup dialog when self checkout is finished"
878
            - "the print receipt popup dialog when self checkout is finished"
879
        -
880
            - pref: SelfCheckAllowByIPRanges
881
              class: short
882
            - (Leave blank if not used. Use ranges or simple ip addresses separated by spaces, like <code>192.168.1.1 192.168.0.0/24</code>.)
879
    Course Reserves:
883
    Course Reserves:
880
        -
884
        -
881
            - pref: UseCourseReserves
885
            - pref: UseCourseReserves
(-)a/opac/sco/help.pl (-1 / +6 lines)
Lines 25-34 use strict; Link Here
25
use warnings;
25
use warnings;
26
use CGI qw ( -utf8 );
26
use CGI qw ( -utf8 );
27
27
28
use C4::Auth   qw(get_template_and_user);
28
use C4::Auth   qw(get_template_and_user in_ipset);
29
use C4::Output qw(output_html_with_http_headers);
29
use C4::Output qw(output_html_with_http_headers);
30
30
31
my $query = new CGI;
31
my $query = new CGI;
32
unless ( in_ipset(C4::Context->preference('SelfCheckAllowByIPRanges')) ) {
33
    print $query->redirect("/cgi-bin/koha/opac-main.pl");
34
    exit;
35
}
36
32
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
37
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
33
    {
38
    {
34
        template_name   => "sco/help.tt",
39
        template_name   => "sco/help.tt",
(-)a/opac/sco/printslip.pl (-1 / +6 lines)
Lines 30-41 use strict; Link Here
30
use warnings;
30
use warnings;
31
use CGI qw ( -utf8 );
31
use CGI qw ( -utf8 );
32
use C4::Context;
32
use C4::Context;
33
use C4::Auth qw/:DEFAULT get_session/;
33
use C4::Auth qw/:DEFAULT get_session in_ipset/;
34
use C4::Output;
34
use C4::Output;
35
use C4::Members;
35
use C4::Members;
36
use C4::Koha;
36
use C4::Koha;
37
37
38
my $input = new CGI;
38
my $input = new CGI;
39
unless ( in_ipset(C4::Context->preference('SelfCheckAllowByIPRanges')) ) {
40
    print $input->header(status => '403 Forbidden - functionality not available from your location');
41
    exit;
42
}
43
39
my $sessionID = $input->cookie("CGISESSID");
44
my $sessionID = $input->cookie("CGISESSID");
40
my $session = get_session($sessionID);
45
my $session = get_session($sessionID);
41
46
(-)a/opac/sco/sco-main.pl (-2 / +8 lines)
Lines 35-41 use Modern::Perl; Link Here
35
35
36
use CGI qw ( -utf8 );
36
use CGI qw ( -utf8 );
37
37
38
use C4::Auth qw(get_template_and_user checkpw);
38
use C4::Auth qw(get_template_and_user checkpw in_ipset);
39
use C4::Koha;
39
use C4::Koha;
40
use C4::Circulation;
40
use C4::Circulation;
41
use C4::Reserves;
41
use C4::Reserves;
Lines 58-64 unless (C4::Context->preference('WebBasedSelfCheck')) { Link Here
58
    exit;
58
    exit;
59
}
59
}
60
60
61
if (C4::Context->preference('AutoSelfCheckAllowed')) 
61
unless ( in_ipset(C4::Context->preference('SelfCheckAllowByIPRanges')) ) {
62
    # redirect to OPAC home if self-checkout not permitted from current IP
63
    print $query->redirect("/cgi-bin/koha/opac-main.pl");
64
    exit;
65
}
66
67
if (C4::Context->preference('AutoSelfCheckAllowed'))
62
{
68
{
63
    my $AutoSelfCheckID = C4::Context->preference('AutoSelfCheckID');
69
    my $AutoSelfCheckID = C4::Context->preference('AutoSelfCheckID');
64
    my $AutoSelfCheckPass = C4::Context->preference('AutoSelfCheckPass');
70
    my $AutoSelfCheckPass = C4::Context->preference('AutoSelfCheckPass');
(-)a/opac/sco/sco-patron-image.pl (-1 / +6 lines)
Lines 19-24 Link Here
19
19
20
use strict;
20
use strict;
21
use warnings;
21
use warnings;
22
use C4::Auth qw(in_ipset);
22
use C4::Service;
23
use C4::Service;
23
use C4::Members;
24
use C4::Members;
24
use Koha::Patron::Images;
25
use Koha::Patron::Images;
Lines 36-41 unless (C4::Context->preference('ShowPatronImageInWebBasedSelfCheck')) { Link Here
36
    exit;
37
    exit;
37
}
38
}
38
39
40
unless ( in_ipset(C4::Context->preference('SelfCheckAllowByIPRanges')) ) {
41
    print $query->header(status => '403 Forbidden - functionality not available from your location');
42
    exit;
43
}
44
39
my ($borrowernumber) = C4::Service->require_params('borrowernumber');
45
my ($borrowernumber) = C4::Service->require_params('borrowernumber');
40
my ($csrf_token) = C4::Service->require_params('csrf_token');
46
my ($csrf_token) = C4::Service->require_params('csrf_token');
41
47
42
- 

Return to bug 14407