Skip to content

Add Metadata Directory of FlatFiles support#1292

Open
pkolmann wants to merge 3 commits intosimplesamlphp:masterfrom
pkolmann:MetadataDirectoryOfFiles
Open

Add Metadata Directory of FlatFiles support#1292
pkolmann wants to merge 3 commits intosimplesamlphp:masterfrom
pkolmann:MetadataDirectoryOfFiles

Conversation

@pkolmann
Copy link
Contributor

I like to split up long config files to split config files.

The MetaData Files usually are quite long and if you need to change
something it's quite bulky to handle them. Diffing between different SPs
is also not too easy.

Thats why I added the support for Metadata config directories. Every SP
goes into it's own flatfile.

The MetaData Files usually are quite long and if you need to change
something it's quite bulky to handle them. Diffing between different SPs
is also not too easy.

Thats why I added the support for Metadata config directories. Every SP
goes into it's own flatfile.
@codecov
Copy link

codecov bot commented Feb 26, 2020

Codecov Report

Merging #1292 into master will increase coverage by 0.15%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #1292      +/-   ##
============================================
+ Coverage     37.85%   38.00%   +0.15%     
- Complexity     3431     3446      +15     
============================================
  Files           129      130       +1     
  Lines          9738     9778      +40     
============================================
+ Hits           3686     3716      +30     
- Misses         6052     6062      +10     

@pkolmann
Copy link
Contributor Author

@tvdijen can you please advise if this change is worth accepting?
Thanks
Philipp

@tvdijen
Copy link
Member

tvdijen commented Feb 26, 2020

Thanks @pkolmann!! I am
In transit from Madrid to The Hague now.. hopefully I can get back to you tomorrow.. I like the general idea of the pr though!

@pkolmann
Copy link
Contributor Author

pkolmann commented Apr 1, 2020

@tvdijen could you take another look at this please.

@tvdijen tvdijen force-pushed the master branch 3 times, most recently from 1c686ab to eb20457 Compare August 17, 2020 20:43
@tvdijen tvdijen force-pushed the master branch 2 times, most recently from 08ebb9c to 64fca25 Compare July 2, 2021 14:12
@tvdijen tvdijen force-pushed the master branch 2 times, most recently from 7a53fc8 to d73ae47 Compare September 26, 2021 13:03
@tvdijen tvdijen force-pushed the master branch 2 times, most recently from e5c0e21 to d5616df Compare January 9, 2022 11:00
@tvdijen tvdijen force-pushed the master branch 3 times, most recently from 2e6ab04 to 32f9acc Compare November 23, 2022 18:24
@tvdijen tvdijen force-pushed the master branch 6 times, most recently from 7e3ea19 to 2523634 Compare January 5, 2023 16:31
@ebeuerle
Copy link

@tvdijen Any luck with merging this PR? This would very handy to have for larger installations...

@tvdijen tvdijen force-pushed the master branch 5 times, most recently from 7587851 to d523b31 Compare August 2, 2023 11:58
@tvdijen tvdijen force-pushed the master branch 3 times, most recently from 8c90121 to d534e3b Compare September 5, 2023 08:09
@tvdijen tvdijen force-pushed the master branch 2 times, most recently from bc1c5c8 to d0a5974 Compare October 17, 2023 21:17
@tvdijen tvdijen force-pushed the master branch 3 times, most recently from ccb9b02 to 120a100 Compare December 1, 2023 14:34
@monkeyiq
Copy link
Contributor

There is also an issue submitted wanting a similar functionality for the XML files for SPs. A comment over on that issue is calling for a more generic solution to allow both flatfile and xml to be loaded on demand: #1368 (comment)

I mention this because the comment may not have been seen on this thread. I've been looking at this PR and the code a little bit in recent days.

@monkeyiq
Copy link
Contributor

I had a bit of a play around with this and ended up with very similar code to what is here though trying to handle xml files as well if they are found in the metadata/subdirectory.d directory. I am not sure what I have in the below branch makes complete sense as I am very new to the SSP code base.

https://github.com/monkeyiq/simplesamlphp/blob/c23a35a2ea33304de92331bba3962394f02feb66/src/SimpleSAML/Metadata/MetaDataStorageHandlerDirectory.php#L120

It does seem that this PR could be extended to check for php files and do something on them and something else if an xml file was found, otherwise maybe just report an ignored file?

@monkeyiq
Copy link
Contributor

Sorry about the wait. I have merged a PR with this functionality into the simplesamlphp-2.3 branch and master.

#2018

The patch should also back port to a 2.2 release reasonably well if you would like to take it for a test run.

@tvdijen tvdijen force-pushed the master branch 2 times, most recently from 6004a77 to 58bf8db Compare May 4, 2024 23:45
@tvdijen tvdijen force-pushed the master branch 2 times, most recently from 5c9fb2c to 0970efc Compare May 27, 2024 12:27
@tvdijen tvdijen force-pushed the master branch 2 times, most recently from c27831c to 71e49f4 Compare June 19, 2024 17:03
@tvdijen tvdijen force-pushed the master branch 3 times, most recently from c06a17a to a52c98d Compare August 20, 2025 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants