Add "Last-Modified" header to OIDC metadata

guimard · Dec 2, 2024 · c71eb0b · c71eb0b
1 parent 57caab8
commit c71eb0b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -4,7 +4,7 @@ env:
   VERSION: 2.20.1
   PGVERSION: 15
   DEBIANRELEASE: bookworm
-  DOCKERREVISION: 1
+  DOCKERREVISION: 2
 
 on:
   push:

diff --git a/Changes.md b/Changes.md
@@ -1,9 +1,12 @@
 # Changes
 
-## v2.20.1-0
+## v2.20.1-2
+* Add "Last-Modified" header for OIDC metadata
+
+## v2.20.1-1 _(2024-11-19)_
 * Update to 2.20.1
 
-## v2.20.0-4 _(2024A-11-14)_
+## v2.20.0-4 _(2024-11-14)_
 
 * Fix SAML regression
 * Fix Captcha rule bug

diff --git a/portal/metadata-ttl.patch b/portal/metadata-ttl.patch
@@ -1,12 +1,14 @@
 --- a/usr/share/perl5/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
 +++ b/usr/share/perl5/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
-@@ -2704,8 +2704,11 @@ sub logout {
+@@ -2704,8 +2704,13 @@ sub logout {
  sub metadata {
      my ( $self, $req ) = @_;
      $req->data->{dropCsp} = 1 if $self->conf->{oidcDropCspHeaders};
 +    my %args;
-+    $args{ttl} = $self->conf->{oidcServiceMetadataTtl}
-+      if $self->conf->{oidcServiceMetadataTtl};
++    if ( $self->conf->{oidcServiceMetadataTtl} ) {
++        $args{ttl}  = $self->conf->{oidcServiceMetadataTtl};
++        $args{date} = $self->conf->{cfgDate};
++    }
      return $self->p->sendJSONresponse( $req,
 -        $self->metadataDoc( $self->get_issuer($req) ) );
 +        $self->metadataDoc( $self->get_issuer($req) ), %args );

diff --git a/uwsgi-portal/metadata-ttl.patch b/uwsgi-portal/metadata-ttl.patch
@@ -1,12 +1,14 @@
 --- a/usr/share/perl5/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
 +++ b/usr/share/perl5/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
-@@ -2704,8 +2704,11 @@ sub logout {
+@@ -2704,8 +2704,13 @@ sub logout {
  sub metadata {
      my ( $self, $req ) = @_;
      $req->data->{dropCsp} = 1 if $self->conf->{oidcDropCspHeaders};
 +    my %args;
-+    $args{ttl} = $self->conf->{oidcServiceMetadataTtl}
-+      if $self->conf->{oidcServiceMetadataTtl};
++    if ( $self->conf->{oidcServiceMetadataTtl} ) {
++        $args{ttl}  = $self->conf->{oidcServiceMetadataTtl};
++        $args{date} = $self->conf->{cfgDate};
++    }
      return $self->p->sendJSONresponse( $req,
 -        $self->metadataDoc( $self->get_issuer($req) ) );
 +        $self->metadataDoc( $self->get_issuer($req) ), %args );