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 2066-2071 sub haspermission { Link Here
2066
    #FIXME - This fcn should return the failed permission so a suitable error msg can be delivered.
2067
    #FIXME - This fcn should return the failed permission so a suitable error msg can be delivered.
2067
}
2068
}
2068
2069
2070
=head2 in_ipset
2071
2072
  $flags = ($ipset);
2073
2074
C<$ipset> A space separated string describing an IP set. Can include single IPs or ranges
2075
2076
Returns 1 if the remote address is in the provided ipset, or 0 otherwise.
2077
2078
=cut
2079
2080
sub in_ipset {
2081
 my ($ipset) = @_;
2082
 my @allowedipranges = split(' ', $ipset);
2083
 if (scalar @allowedipranges > 0) {
2084
    my @rangelist;
2085
    eval { @rangelist = Net::CIDR::range2cidr(@allowedipranges); }; return 0 if $@;
2086
    unless (Net::CIDR::cidrlookup($ENV{'REMOTE_ADDR'}, @rangelist)) {
2087
      return 0;
2088
    }
2089
 }
2090
 return 1;
2091
}
2092
2069
sub getborrowernumber {
2093
sub getborrowernumber {
2070
    my ($userid) = @_;
2094
    my ($userid) = @_;
2071
    my $userenv = C4::Context->userenv;
2095
    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 479-484 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
479
('SearchEngine','Zebra','Elasticsearch|Zebra','Search Engine','Choice'),
479
('SearchEngine','Zebra','Elasticsearch|Zebra','Search Engine','Choice'),
480
('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
480
('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
481
('SearchWithISBNVariations','0',NULL,'If enabled, search on all variations of the ISBN','YesNo'),
481
('SearchWithISBNVariations','0',NULL,'If enabled, search on all variations of the ISBN','YesNo'),
482
('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'),
482
('SelfCheckHelpMessage','','70|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
483
('SelfCheckHelpMessage','','70|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
483
('SelfCheckoutByLogin','1',NULL,'Have patrons login into the web-based self checkout system with their username/password or their cardnumber','YesNo'),
484
('SelfCheckoutByLogin','1',NULL,'Have patrons login into the web-based self checkout system with their username/password or their cardnumber','YesNo'),
484
('SelfCheckReceiptPrompt','1','NULL','If ON, print receipt dialog pops up when self checkout is finished','YesNo'),
485
('SelfCheckReceiptPrompt','1','NULL','If ON, print receipt dialog pops up when self checkout is finished','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+4 lines)
Lines 843-848 Circulation: Link Here
843
                  yes: Show
843
                  yes: Show
844
                  no: "Don't show"
844
                  no: "Don't show"
845
            - "the print receipt popup dialog when self checkout is finished"
845
            - "the print receipt popup dialog when self checkout is finished"
846
        -
847
            - pref: SelfCheckAllowByIPRanges
848
              class: short
849
            - (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>.)
846
    Course Reserves:
850
    Course Reserves:
847
        -
851
        -
848
            - pref: UseCourseReserves
852
            - pref: UseCourseReserves
(-)a/opac/sco/help.pl (-1 / +7 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
33
unless ( in_ipset(C4::Context->preference('SelfCheckAllowByIPRanges')) ) {
34
    print $query->redirect("/cgi-bin/koha/opac-main.pl");
35
    exit;
36
}
37
32
my ($template, $borrowernumber, $cookie) = get_template_and_user({
38
my ($template, $borrowernumber, $cookie) = get_template_and_user({
33
    template_name => "sco/help.tt",
39
    template_name => "sco/help.tt",
34
    query => $query,
40
    query => $query,
(-)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