Bugzilla – Attachment 107834 Details for
Bug 25360
Use secure flag for CGISESSID cookie
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25360: (follow-up) Remove the https FIXME in Auth.pm
Bug-25360-follow-up-Remove-the-https-FIXME-in-Auth.patch (text/plain), 3.32 KB, created by
Marcel de Rooy
on 2020-08-05 14:09:05 UTC
(
hide
)
Description:
Bug 25360: (follow-up) Remove the https FIXME in Auth.pm
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2020-08-05 14:09:05 UTC
Size:
3.32 KB
patch
obsolete
>From 0050716e6d2977cba7465a78500f3881df970c37 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 5 Aug 2020 13:48:59 +0000 >Subject: [PATCH] Bug 25360: (follow-up) Remove the https FIXME in Auth.pm >Content-Type: text/plain; charset=utf-8 > >The FIXME is no longer valid since we fixed the X-Forwarded headers >for Plack. And since we do not even use using_https anymore in >the templates (see bug 21094). > >Test plan: >Run Auth.t >Git grep for using_https > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/Auth.pm | 6 ------ > installer/html-template-to-template-toolkit.pl | 12 ++++++------ > 2 files changed, 6 insertions(+), 12 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index e45fb21efb..d9d5648563 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -450,11 +450,6 @@ sub get_template_and_user { > > # these template parameters are set the same regardless of $in->{'type'} > >- # Set the using_https variable for templates >- # FIXME Under Plack the CGI->https method always returns 'OFF' >- my $https = $in->{query}->https(); >- my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0; >- > my $minPasswordLength = C4::Context->preference('minPasswordLength'); > $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3; > $template->param( >@@ -473,7 +468,6 @@ sub get_template_and_user { > singleBranchMode => ( Koha::Libraries->search->count == 1 ), > XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"), > XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"), >- using_https => $using_https, > noItemTypeImages => C4::Context->preference("noItemTypeImages"), > marcflavour => C4::Context->preference("marcflavour"), > OPACBaseURL => C4::Context->preference('OPACBaseURL'), >diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl >index 60cd951dd1..2b9084b4b2 100755 >--- a/installer/html-template-to-template-toolkit.pl >+++ b/installer/html-template-to-template-toolkit.pl >@@ -27,12 +27,12 @@ my $tmpl_in_dir = 'koha-tmpl'; > my $tmpl_out_dir = 'koha-tt'; > > # template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive) >-my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled", >-"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages", >-"virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay", >-"OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled", >-"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag", >-"OPACAmazonEnabled", "SyndeticsCoverImages","using_https"); >+my @globals = ( "themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled", >+ "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages", >+ "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay", >+ "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled", >+ "TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag", >+ "OPACAmazonEnabled", "SyndeticsCoverImages" ); > > # Arguments: > my $KOHA_ROOT; >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25360
:
104244
|
104469
|
104470
|
104642
|
106176
|
106177
|
106178
|
107833
|
107834
|
108161
|
108162