Attachment 43995 Details for Bug 13799 – [PASSED QA] Bug 13799: Allow to set Mojolicious secret in $KOHA_CONF

[patch] [PASSED QA] Bug 13799: Allow to set Mojolicious secret in $KOHA_CONF

PASSED-QA-Bug-13799-Allow-to-set-Mojolicious-secre.patch (text/plain), 1.85 KB, created by Kyle M Hall (khall) on 2015-10-26 13:38:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-10-26 13:38:38 UTC

Size: 1.85 KB

patch

obsolete

>From 2031ed1c0f523c72543c24957d802ad22f8fbb8a Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 7 Oct 2015 11:10:12 +0200
>Subject: [PATCH] [PASSED QA] Bug 13799: Allow to set Mojolicious secret in $KOHA_CONF
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> Koha/REST/V1.pm   |    6 ++++++
> etc/koha-conf.xml |    3 +++
> 2 files changed, 9 insertions(+), 0 deletions(-)
>
>diff --git a/Koha/REST/V1.pm b/Koha/REST/V1.pm
>index 375dff5..62f7693 100644
>--- a/Koha/REST/V1.pm
>+++ b/Koha/REST/V1.pm
>@@ -19,6 +19,7 @@ use Modern::Perl;
> use Mojo::Base 'Mojolicious';
> 
> use C4::Auth qw( check_cookie_auth get_session );
>+use C4::Context;
> use Koha::Borrowers;
> 
> sub startup {
>@@ -42,6 +43,11 @@ sub startup {
>     # Force charset=utf8 in Content-Type header for JSON responses
>     $self->types->type(json => 'application/json; charset=utf8');
> 
>+    my $secret_passphrase = C4::Context->config('api_secret_passphrase');
>+    if ($secret_passphrase) {
>+        $self->secrets([$secret_passphrase]);
>+    }
>+
>     $self->plugin(Swagger2 => {
>         route => $route,
>         url => $self->home->rel_file("api/v1/swagger.json"),
>diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
>index 1f2b460..74a5720 100644
>--- a/etc/koha-conf.xml
>+++ b/etc/koha-conf.xml
>@@ -117,6 +117,9 @@ __PAZPAR2_TOGGLE_XML_POST__
>  <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
>  <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
> 
>+ 
>+ <api_secret_passphrase>CHANGEME</api_secret_passphrase>
>+
>  
>  <ttf>
>     <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font>
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 13799: 36700 | 36705 | 36938 | 36941 | 37119 | 37132 | 37172 | 38246 | 39156 | 39158 | 39159 | 39160 | 39161 | 39162 | 39163 | 39164 | 40088 | 40092 | 40093 | 40094 | 40098 | 40099 | 40101 | 40140 | 40141 | 40142 | 40463 | 40464 | 40465 | 40466 | 40467 | 40468 | 40469 | 40470 | 40471 | 40551 | 40552 | 40553 | 40554 | 40560 | 40561 | 40584 | 40585 | 40586 | 40587 | 40616 | 40617 | 40618 | 40619 | 41160 | 41161 | 41162 | 41268 | 41269 | 41270 | 41271 | 41272 | 41273 | 41274 | 41320 | 41321 | 41326 | 41327 | 41328 | 41329 | 41330 | 41331 | 41538 | 41539 | 41540 | 41541 | 41542 | 41543 | 41547 | 41554 | 42044 | 42085 | 42086 | 42123 | 42518 | 42766 | 42768 | 42801 | 42874 | 42875 | 42876 | 42877 | 42878 | 43186 | 43187 | 43189 | 43190 | 43191 | 43192 | 43204 | 43205 | 43206 | 43207 | 43208 | 43209 | 43210 | 43211 | 43212 | 43213 | 43214 | 43980 | 43981 | 43987 | 43989 | 43990 | 43991 | 43992 | 43993 | 43994 | 43995 | 43996 | 43997 | 43998 | 43999 | 44000 | 44001 | 44185 | 44285 | 44313 | 44375 | 44376 | 44377 | 44378 | 44379 | 44380 | 44381 | 44382 | 44383 | 44384 | 44385