SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
XavXav
71067710d85REMOTE_USER gets populated when we set it to the Shibboleth "attribute" name that ecommonsId gets mapped to in attrib...
XavXav
2daf8c20a45Merge remote-tracking branch 'origin/remote-user-experiment' into remote-user-experiment # Conflicts: # experiment-r...
XavXav
59a65de6438Removed the code that relies on the "remoteUser" header being populated (by HeaderAdditionFilter) so we can remove He...
XavXav
7b2a65b8130Experiment baseline (works)
XavXav
79091a0e7e8Experiment baseline (works)
dwalenddwalend
c7bb13e2bd3Moved the help doc link to 3.3 for SHRINE2020-1141
Marc-Danie NazaireMarc-Danie Nazaire
ed202b9213ePull request #1311: SHRINE2020-1196 - Fix SHRINE docker network Merge in SHRINE/shrine from bugfix/SHRINE2020-1196 t...
Marc-Danie NazaireMarc-Danie Nazaire
e5298f14d6bSHRINE2020-1196 - Fix SHRINE docker network - added - fixed merge issue
Marc-Danie NazaireMarc-Danie Nazaire
6a32c76b1c7SHRINE2020-1196 - Fix SHRINE docker network - added - reverted name change for network lifecycle tool since it was no...
Marc-Danie NazaireMarc-Danie Nazaire
84ad67aeda7SHRINE2020-1196 - Fix SHRINE docker network - added -dist to network lifecycle tool name
XavXav
219094ce4dfreduced timeout from 20 minutes to 2 minutes, for testing
XavXav
9427ba6ed8faddress more pull request comments
XavXav
daba169476faddress some pull request comments
Marc-Danie NazaireMarc-Danie Nazaire
337c5cc9f8cSHRINE2020-1196 - Fix SHRINE docker network - removed extraneous commas
Marc-Danie NazaireMarc-Danie Nazaire
2c01b89d6d3Pull request #1322: SHRINE2020-1203 - Remove the unused panelTiming from the QEP's front-end javascript code Merge i...
Marc-Danie NazaireMarc-Danie Nazaire
8395953f175SHRINE2020-1203 - Remove the unused panelTiming from the QEP's front-end javascript code
XavXav
1c50638b883SHRINE2020-1208 : add missing "networkConfig" to WrappedIdleTimer definition; add missing useEffect call to fetch net...
Marc-Danie NazaireMarc-Danie Nazaire
31567cdcce9Pull request #1321: Feature/SHRINE2020 1089 - If the user deletes the last concept in event 3, reset the panel and re...
Marc-Danie NazaireMarc-Danie Nazaire
d74ed1e8d0eSHRINE2020-1089 - If the user deletes the last concept in event 3, reset the panel and relationship to default - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
912d1e40c21SHRINE2020-1089 - If the user deletes the last concept in event 3, reset the panel and relationship to default - Fixe...
XavXav
6d53e3afe08SHRINE2020-1208 : add missing import; add console logging
XavXav
f8e392fafaaSHRINE2020-1208 : Fix typo; logout of SSO when clicking logout on the time out dialog
Marc-Danie NazaireMarc-Danie Nazaire
0cb3639f77cPull request #1320: SHRINE2020-1195 - Wording for readable criteria text for three event queries - Fixed missing star...
Marc-Danie NazaireMarc-Danie Nazaire
678efbc7c9aSHRINE2020-1195 - Wording for readable criteria text for three event queries - Fixed missing start date in criteria h...
XavXav
2008c375623SHRINE2020-1208 : modify session time-out dialog to meet requirements
XavXav
fc7d770db05phase1-sso : rm link to "www.google.com" where not needed; replace with "some-logout-url" where needed
David WalendDavid Walend
1d4591131f5Pull request #1317: Bugfix/SHRINE2020 1178 Merge in SHRINE/shrine from bugfix/SHRINE2020-1178 to develop * commit '...
Marc-Danie NazaireMarc-Danie Nazaire
3d7ebb5ba5fMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-1196
XavXav
42ad1b66f78Merge branch 'develop' into sso-phase1 # Conflicts: # commons/auth/src/main/scala/net/shrine/authentication/http4s/U...
Marc-Danie NazaireMarc-Danie Nazaire
1bbd5f89e79sso-phase1: cleanup code for displaying landing page instead of login page when in sso mode
Marc-Danie NazaireMarc-Danie Nazaire
71d7c5317fbsso-phase1: check cookie to see whether to display login info
Marc-Danie NazaireMarc-Danie Nazaire
0f2a43068b8sso-phase1: test setting cookie
Marc-Danie NazaireMarc-Danie Nazaire
a4622380800sso-phase1: add custom response header for sso
Marc-Danie NazaireMarc-Danie Nazaire
d085967f55asso-phase1: add check for null query string
Marc-Danie NazaireMarc-Danie Nazaire
fcc0984b2a7Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Marc-Danie NazaireMarc-Danie Nazaire
824ff0a1242sso-phase1: added back placeholder holder username and password to login request
XavXav
63d571c5e3eMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1
XavXav
071193fc0fcadd some detailed comments to the sample configuration files
Marc-Danie NazaireMarc-Danie Nazaire
92d5656585bsso-phase1: modify query string and removed check for authType on front-end
Marc-Danie NazaireMarc-Danie Nazaire
e94e5aabb04sso-phase1: added back query string logging
Marc-Danie NazaireMarc-Danie Nazaire
af566abff91sso-phase1: removed throwing of exception in UserAuthentication.scalah
Marc-Danie NazaireMarc-Danie Nazaire
d57c392f045sso-phase1: reverting all changes for hack URL queryString to set sso mode
Marc-Danie NazaireMarc-Danie Nazaire
6f3638e947asso-phase1: undo hack URL queryString to set sso mode
Marc-Danie NazaireMarc-Danie Nazaire
05c5b116043sso-phase1: hack URL queryString to set sso mode
Marc-Danie NazaireMarc-Danie Nazaire
271d9c50355sso-phase1: prep work for not displaying login page for shib auth
Marc-Danie NazaireMarc-Danie Nazaire
3be9b093969sso-phase1: renamed authenticationType for single sign-on from "sso" to "shib"
Marc-Danie NazaireMarc-Danie Nazaire
71f1e8fecfeMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1 # Conflicts: # qep/frontend/src/models/NetworkConfi...
Marc-Danie NazaireMarc-Danie Nazaire
9b4ef6945d1sso-phase1: a little code cleanup for changes for making ssoLogoutUrl configurable
XavXav
750a2d144d3Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
XavXav
5c0a0245d4bAttempt to tie value of ssoLogoutUrl from REST call to UI
Marc-Danie NazaireMarc-Danie Nazaire
4e203d0dd1cMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1 # Conflicts: # shrine-setup/src/main/resources/shri...
Marc-Danie NazaireMarc-Danie Nazaire
6894de715e7sso-phase1: added ssLogoutUser to the NetworkConfig model
Carl WoolfCarl Woolf
f3a4334d9b4Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Carl WoolfCarl Woolf
049dc371b84console.log the authType
XavXav
59cfb61ccbeMerge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1
Carl WoolfCarl Woolf
c6956870199yet another try to skip login form
XavXav
fec8037a9b1Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
XavXav
8ae07558be7deleted useless comment
Marc-Danie NazaireMarc-Danie Nazaire
47fb32486adsso-phase1: moved ssoLogoutUrl to shrine.webclient section of shrine.conf
David WalendDavid Walend
2be933fa5d0Pull request #1314: Feature/SHRINE2020 1131 Merge in SHRINE/shrine from feature/SHRINE2020-1131 to develop * commit...
XavXav
ceeeb63e057Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1
XavXav
04659376d31Push ssoLogoutUrl under webclient in the config files
Marc-Danie NazaireMarc-Danie Nazaire
9bac77a01cesso-phase1: log updates
Marc-Danie NazaireMarc-Danie Nazaire
ee9738b85fbsso-phase1: removed anonymous user fallback
David WalendDavid Walend
59f28dea396Pull request #1315: Feature/SHRINE2020 1200 Merge in SHRINE/shrine from feature/SHRINE2020-1200 to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
977759cef40sso-phase1: prepping for removing anonymous user
Marc-Danie NazaireMarc-Danie Nazaire
bb7dffb5715sso-phase1: prepping for removing anonymous user
Carl WoolfCarl Woolf
a35316a2282tweak broken test
Carl WoolfCarl Woolf
4c5b90e33c6add conf property ssoLogoutUrl. maybe only one matters
Carl WoolfCarl Woolf
056a1eaa5a2remove authType changes but try ssoLogoutUrl
XavXav
de2cfbf4571Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
XavXav
1e23501503aFix unit test
Carl WoolfCarl Woolf
744a5d20fbcMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Carl WoolfCarl Woolf
a81b06ef52fadd back in some logging
XavXav
e89954539a4Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
XavXav
7e543568f7bMerge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
Carl WoolfCarl Woolf
84d9bbaf4f9#3 Try to skip shrine login form during SSO
XavXav
b26a0b52686Trying to understand the pathway from config file to UI
Carl WoolfCarl Woolf
c5f8d8c3237#2 Try to skip shrine login form during SSO
Carl WoolfCarl Woolf
be79f50fd42Revert "Revert "Try to skip shrine login form during SSO"" This reverts commit 9d759d90d1540a61d92fdcf1d4aa554f6198d...
Carl WoolfCarl Woolf
9d759d90d15Revert "Try to skip shrine login form during SSO" This reverts commit 8741723ca848a0ddafa1c40579ea9de6005ebc55.
Carl WoolfCarl Woolf
8741723ca84Try to skip shrine login form during SSO
Marc-Danie NazaireMarc-Danie Nazaire
13cc616cd24SHRINE2020-1196 - Fix SHRINE docker network - decreased wait time for the mysql db
Marc-Danie NazaireMarc-Danie Nazaire
a5441a0b655SHRINE2020-1196 - Fix SHRINE docker network
Marc-Danie NazaireMarc-Danie Nazaire
ff2000636a0SHRINE2020-1196 - Fix SHRINE docker network
Marc-Danie NazaireMarc-Danie Nazaire
c40ce3fada0Pull request #1316: Bugfix/SHRINE2020 1195 - Wording for readable criteria text for three event queries Merge in SHR...
Marc-Danie NazaireMarc-Danie Nazaire
89852d3c407SHRINE2020-1195 - Wording for readable criteria text for three event queries - Fixed unit test after merge
Marc-Danie NazaireMarc-Danie Nazaire
44a9d49f980Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-1195
David WalendDavid Walend
9e63f02c8eaPull request #1313: Feature/SHRINE2020 1102 Merge in SHRINE/shrine from feature/SHRINE2020-1102 to develop * commit...
dwalenddwalend
89289d04df3Review comment from Marc-Danie for SHRINE2020-1102
Carl WoolfCarl Woolf
9218929824eseparate header-addition into its own filter
Marc-Danie NazaireMarc-Danie Nazaire
c5e7455eb2fSHRINE2020-1195 - Wording for readable criteria text for three event queries - Updated unit tests
dwalenddwalend
68920830a60Moved the breakdownResultOutputTypes default section to the adapter for SHRINE2020-1178
XavXav
fa0fe7164ecMerge branch 'develop' into sso-phase1
Marc-Danie NazaireMarc-Danie Nazaire
fffd46cc714Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-1196
Marc-Danie NazaireMarc-Danie Nazaire
76d5d0c51e2SHRINE2020-1195 - Wording for readable criteria text for three event queries - another comment edit
Marc-Danie NazaireMarc-Danie Nazaire
ac2abf75f3fSHRINE2020-1195 - Wording for readable criteria text for three event queries - comment edit
Marc-Danie NazaireMarc-Danie Nazaire
87c953914faSHRINE2020-1195 - Wording for readable criteria text for three event queries - Added unit test
XavXav
d09d1703139Reinstate changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a...
dwalenddwalend
2bd915297afSome tidying up for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
f31b09cbaabSHRINE2020-1195 - Wording for readable criteria text for three event queries
Marc-Danie NazaireMarc-Danie Nazaire
b746a145074removed modification of getHeader(s: String) method
Marc-Danie NazaireMarc-Danie Nazaire
a683528b6ebminor formatting change
Marc-Danie NazaireMarc-Danie Nazaire
17337fc1d93added check for null remoteUser attribute in modified header methods
dwalenddwalend
010171c923fAdded back changeDate for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
22e15b61b19modified getHeaderNames to only add remote_user if it exists
dwalenddwalend
32d1d7b4d44Didn't mean to delete dateCreated for SHRINE2020-1200
dwalenddwalend
d419bf16e07Maybe this capitalization matters for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
68ec9ff8be9add back remote user to getHeaderNames
Marc-Danie NazaireMarc-Danie Nazaire
24af69f3ed5add back remote user to getHeader(s: String)
Marc-Danie NazaireMarc-Danie Nazaire
52f521ebbd1add back remote user to getHeaderNames
Marc-Danie NazaireMarc-Danie Nazaire
49bb69153c3add back remote user to getHeaders(s: String)
Marc-Danie NazaireMarc-Danie Nazaire
80c56c87532comment out insertion of remote user
dwalenddwalend
0ca312bd6acsemicolon for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
4cd52c667a0Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
Marc-Danie NazaireMarc-Danie Nazaire
729603bf2d8comment out some of the logging
dwalenddwalend
dfce0cb0bb4First pass of database cleanup for SHRINE2020-1200
dwalenddwalend
ef57a0c06d8Changed out for a better exception for SHRINE2020-1131
dwalenddwalend
967e2ba60d3Another stray import for SHRINE2020-1102
XavXav
23064d262feReinstate changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a...
dwalenddwalend
e4f6f74ca00Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102
dwalenddwalend
bd8b05c673eCouple of wierd imports that slipped in for SHRINE2020-1102
XavXav
77912d6d4d2Roll back changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a...
dwalenddwalend
52cb7547e08Found a way to move CrcRequestType after freeing it up for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
10513bcff46Pull request #1312: SHRINE2020-1188 - "(optional)" is missing from the text displayed in Event 3 panel Merge in SHRI...
dwalenddwalend
2c450e3b9d6Diffusing CrcRequestType and RequestType dependencies for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
87ccc0d3ab3SHRINE2020-1188 - "(optional)" is missing from the text displayed in Event 3 panel
dwalenddwalend
3083744620cMoved stuff used by just the PM cell auth check to auth for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
d80d72246edPull request #1308: Feature/SHRINE2020 1197 - Add a "Add Event" button to trigger the 3rd event panel Merge in SHRIN...
dwalenddwalend
e4ec9f5addaMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
179e661ab38SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css cleanup
Marc-Danie NazaireMarc-Danie Nazaire
0b971fad6e6SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Fixed switch from and to timeline
dwalenddwalend
811cb0c4ab3Moved more adapter-only code for SHRINE2020-1102, including the query package
Marc-Danie NazaireMarc-Danie Nazaire
f7982416be8SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css change
Carl WoolfCarl Woolf
4f71dc32da8typo
Carl WoolfCarl Woolf
9d0d3a5d5adclean up logs a bit
Carl WoolfCarl Woolf
427c16f6bf6tell users to call userId via id 'remoteUser'
dwalenddwalend
7fcd2d3cb65Even more refactoring and deleting for SHRINE2020-1102
Carl WoolfCarl Woolf
f75d0240d73What about method getRemoteUser()!?
Carl WoolfCarl Woolf
d3fa45ae283Another try for (log) header for remote_user
Carl WoolfCarl Woolf
04c05f2caedLook for (log) header for (ajp_)remote_user
dwalenddwalend
5d5b5049036Removed even more dead code for SHRINE2020-1102
Carl WoolfCarl Woolf
02f3fef91ebLook for (log) attribute for remote_user
Carl WoolfCarl Woolf
e5cd5267757samples update
Marc-Danie NazaireMarc-Danie Nazaire
b1ddd10e2f7SHRINE2020-1196 - Fix SHRINE docker network - hub config cleanup
Marc-Danie NazaireMarc-Danie Nazaire
38daf5de136SHRINE2020-1196 - Fix SHRINE docker network - Comment cleanup
Marc-Danie NazaireMarc-Danie Nazaire
2ea34595315SHRINE2020-1196 - Fix SHRINE docker network
Carl WoolfCarl Woolf
4b03e41fb8efix merge bug
Carl WoolfCarl Woolf
db2b8d45886sample
Carl WoolfCarl Woolf
65db173bccbMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Carl WoolfCarl Woolf
7f6642b538fMerge branch 'develop' into sso-phase1 # Conflicts: # pom.xml
XavXav
f6d497caa32Add Tomcat's server.xml configuration file
Marc-Danie NazaireMarc-Danie Nazaire
16ff4fd15f3convert to proper java enumeration
Carl WoolfCarl Woolf
b5e3b44d3dastep one for adding remote_header to requests -- override a few irritable methods
Carl WoolfCarl Woolf
5b4414a2b4cstep zero for adding remote_header to requests
Marc-Danie NazaireMarc-Danie Nazaire
767cf7db8bfPull request #1309: SHRINE2020-1199 - Start making SHRINE-4.0.0 SNAPSHOTS Merge in SHRINE/shrine from feature/SHRINE...
Carl WoolfCarl Woolf
3a20d7d0d85samples
Carl WoolfCarl Woolf
59550879dedmake 'samples' match SSOT (sso-configs)
XavXav
af599589427Removed no-longer-needed (officially as of Apache 2.4.10, tested with 2.4.54) work-around to populate the local addre...
Carl WoolfCarl Woolf
b355634866dtry getting remote_user from attributes
Carl WoolfCarl Woolf
5e51d044341may need local-address hack after all
Marc-Danie NazaireMarc-Danie Nazaire
02e52f0f551SHRINE2020-1199 - Start making SHRINE-4.0.0 SNAPSHOTS
Carl WoolfCarl Woolf
14214c79a9efix email spelling. comment out local-address hack
Carl WoolfCarl Woolf
ac7f0ec8ed3attributes might work better now?
Carl WoolfCarl Woolf
658246fc67etry adding attribute prefix AJP_
Marc-Danie NazaireMarc-Danie Nazaire
5f7fc464e0bSHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - minor format change
Marc-Danie NazaireMarc-Danie Nazaire
fc895362e88SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css tweak for the Add event button
Marc-Danie NazaireMarc-Danie Nazaire
1c8e6dbf5c9SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Code cleanup
Marc-Danie NazaireMarc-Danie Nazaire
82e0a4270f6SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Fixed unit test
Carl WoolfCarl Woolf
6bee162c337add dump of attributes
Marc-Danie NazaireMarc-Danie Nazaire
547d184d59fSHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel
dwalenddwalend
13ca9308701Moved all of the Read pairs for SHRIEN2020-1102
XavXav
b30457025ddswitch to headers mode (with accompanying change to sp.conf: ShibUseHeaders On) which populates the headers appropria...
dwalenddwalend
0ea1b4666e7Moving more code for SHRINE2020-1102
dwalenddwalend
5462e67eca0Found more dead code to delete for SHRINE2020-1102
dwalenddwalend
f7abd7299e4Think I found a technique to untie the knot in the i2b2 protocol for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
2c61c2cb76bPull request #1307: Feature/SHRINE2020 1090 - Add options to "the first" to a drop for both event relationships - Add...
Marc-Danie NazaireMarc-Danie Nazaire
26be57ce0a9Pull request #1306: SHRINE2020-1092 - Reload queries with the 3rd event when "edit criteria" is selected Merge in SH...
Marc-Danie NazaireMarc-Danie Nazaire
a46bc2a4e50revert call remoteUser function on request
Marc-Danie NazaireMarc-Danie Nazaire
792d93cd5d7call remoteUser function on request
Marc-Danie NazaireMarc-Danie Nazaire
1dae7694402check for certain attributes
Marc-Danie NazaireMarc-Danie Nazaire
dd3b6fb47bfreturns attributes in request in qep/authPing api call
Marc-Danie NazaireMarc-Danie Nazaire
c4d6eec4213list attributes names in ContentSecurityPolicyFilter
Marc-Danie NazaireMarc-Danie Nazaire
11c16615ecfreturns attributes in request as json in qep/authPing api call
Marc-Danie NazaireMarc-Danie Nazaire
8566a254fd4returns entire request as json in qep/authPing api call
Marc-Danie NazaireMarc-Danie Nazaire
90d84355f01debug output
Marc-Danie NazaireMarc-Danie Nazaire
fcd4e34d298changes to modify request in order to set localAddress
Marc-Danie NazaireMarc-Danie Nazaire
3d1346ebba7changes to modify request in order to set localAddress
Next →