Diffusion SHRINE MedCo Fork 40b74feac915

shrine…
40b74feac915
Actions

Authored by ben-carmen <benjamin_carmen@hms.harvard.edu> on Nov 8 2016, 19:10.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed

ben-carmen <benjamin_carmen@hms.harvard.edu>

Nov 8 2016, 19:10

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:8b47d0ac7dba: Fix for SHRINE-1750, correct calculation of time to send the first email.
R2664:da7dfb32085e: added a message for when there are no graphing results, made text for topic…

Branches

Unknown

Tags

Unknown

Event Timeline

ben-carmen <benjamin_carmen@hms.harvard.edu> committed R2664:40b74feac915: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by ben-carmen <benjamin_carmen@hms.harvard.edu>).Nov 8 2016, 19:10

Merged Changes

Commit	Author	Details	Committed
8b47d0ac7dba	David Walend	Fix for SHRINE-1750, correct calculation of time to send the first email.	Nov 8 2016
bf244a20bc89	David Walend	Added a default problem handler that both writes to the log and inserts in the…	Nov 8 2016
2f8dffb213ce	Ty	fixed signing for hub networks	Nov 8 2016
23e4feff5b41	Ty	removed java.time.Instant as well	Nov 7 2016
1df571fb42a4	Ty	removed java.time.Clock	Nov 7 2016
b85ef5a3279a	Ty	Merge branch 'feature/new-crypto' into develop	Nov 7 2016
5c7637a87679	Ty	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 7 2016
5eed792535e8	Ty	rough draft of finished prodcut	Nov 7 2016
0a61653e5804	David Walend	Added net.shrine.steward.CannotStartDsa and net.shrine.dashboard.	Nov 7 2016
2f16c2ad8650	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 7 2016
0d8852f43324	David Walend	Added net.shrine.steward.CannotStartDsa and net.shrine.dashboard.	Nov 7 2016
1e4e0c5afb8d	Ty	updated keystore parser, need to fix client	Nov 7 2016
e90613ca423e	Ty	completely replaced the old crypto module. To remove it completely, will need…	Nov 3 2016
b932130e92e8	Ty	fixes to signing/verifying, test fixes	Nov 3 2016
b32cde68934a	Ty	wrote out simple hubCert test	Nov 1 2016
0efb31bd1876	Ty	fixed error handling on startup, added simple keystore for tests	Nov 1 2016
c8def76b96e2	Ty	messing with tests/generating new test keystores	Oct 31 2016
5adbff9b56a3	Ty	Error handling upon constructing from keystore file	Oct 28 2016
553271c8cb23	Ty	finished downstream cert collection	Oct 27 2016
da43f0e3d2a1	Ty	cleaned up verify	Oct 26 2016
675f8d449f50	Ty	Initial steps for crypto rewrite	Oct 26 2016
403a1aace839	Ty	initial setup of verifying cross site signatures	Oct 19 2016
b8135f2a4171	Ty	Merge branch 'develop' into feature/new-crypto	Oct 14 2016

Changes (104)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		adapter/adapter-service/src/main/scala/net/shrine/adapter/AdapterComponents.scala
M		adapter/adapter-service/src/main/scala/net/shrine/adapter/audit/AdapterAuditDb.scala
M		adapter/adapter-service/src/main/scala/net/shrine/adapter/service/AdapterService.scala
M		adapter/adapter-service/src/test/scala/net/shrine/adapter/service/AdapterServiceTest.scala
M		apps/dashboard-app/pom.xml
M		apps/dashboard-app/src/main/js/src/app/common/utils.service.js
M		apps/dashboard-app/src/main/js/src/app/diagnostic/diagnostic.model.js
M		apps/dashboard-app/src/main/js/src/app/diagnostic/sidebar/node-menu.tpl.html
M		apps/dashboard-app/src/main/js/src/app/diagnostic/sidebar/sidebar.tpl.html
A		apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js
A		apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.tpl.html
M		apps/dashboard-app/src/main/js/src/app/diagnostic/views/keystore.controller.js
M		apps/dashboard-app/src/main/js/src/app/diagnostic/views/keystore.tpl.html
M		apps/dashboard-app/src/main/js/src/app/shrine-tools.configuration.js
M		apps/dashboard-app/src/main/js/test/admin/status/keystore.json
P		apps/dashboard-app/src/main/js/test/admin/status/qep.json Copied to apps/dashboard-app/src/test/resources/teststatus/qep
M		apps/dashboard-app/src/main/resources/reference.conf
M		apps/dashboard-app/src/main/scala/net/shrine/dashboard/Boot.scala
M		apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
M		apps/dashboard-app/src/main/scala/net/shrine/dashboard/jwtauth/ShrineJwtAuthenticator.scala
M		apps/dashboard-app/src/test/resources/shrine.conf
A		apps/dashboard-app/src/test/resources/shrine.keystore
M		apps/dashboard-app/src/test/resources/teststatus/keystore
P		apps/dashboard-app/src/test/resources/teststatus/qep Copied from apps/dashboard-app/src/main/js/test/admin/status/qep.json
M		apps/dashboard-app/src/test/scala/net/shrine/dashboard/DashboardServiceTest.scala
M		apps/shrine-app/pom.xml
M		apps/shrine-app/src/main/scala/net/shrine/happy/HappyShrineService.scala
M		apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
M		apps/shrine-app/src/main/scala/net/shrine/wiring/ShrineOrchestrator.scala
M		apps/shrine-app/src/test/resources/shrine.conf
M		apps/shrine-app/src/test/resources/shrine.keystore
M		apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
M		apps/shrine-app/src/test/scala/net/shrine/wiring/ShrineOrchestratorTest.scala
M		apps/steward-app/src/main/scala/net/shrine/steward/Boot.scala
M		apps/steward-app/src/test/resources/add_json_data.py
M		commons/auth/src/main/scala/net/shrine/authentication/UserAuthenticator.scala
M		commons/auth/src/main/scala/net/shrine/authorization/steward/StewardModel.scala
M		commons/client/src/main/scala/net/shrine/client/JerseyHttpClient.scala
M		commons/client/src/main/scala/net/shrine/client/Poster.scala
M		commons/client/src/test/scala/net/shrine/client/JerseyHttpClientTest.scala
M		commons/client/src/test/scala/net/shrine/client/JerseyShrineClientTest.scala
M		commons/config/src/main/scala/net/shrine/config/package.scala
M		commons/crypto/pom.xml
M		commons/crypto/src/main/scala/net/shrine/crypto/DefaultSignerVerifier.scala
M		commons/crypto/src/main/scala/net/shrine/crypto/KeyStoreCertCollection.scala
M		commons/crypto/src/main/scala/net/shrine/crypto/KeyStoreDescriptor.scala
M		commons/crypto/src/main/scala/net/shrine/crypto/KeyStoreDescriptorParser.scala
M		commons/crypto/src/main/scala/net/shrine/crypto/TrustParam.scala
A		commons/crypto/src/main/scala/net/shrine/crypto/UtilHasher.scala
A	(dir)	commons/crypto/src/main/scala/net/shrine/crypto2/
A		commons/crypto/src/main/scala/net/shrine/crypto2/AbstractHubCertCollection.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/BouncyKeyStoreCollection.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/CertCollectionAdapter.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/DownStreamCertCollection.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/HubCertCollection.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/ImproperlyConfiguredKeyStoreProblem.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/KeyStoreEntry.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/PeerCertCollection.scala
A		commons/crypto/src/main/scala/net/shrine/crypto2/SignerVerifierAdapter.scala
A	(dir)	commons/crypto/src/test/resources/crypto2/
A		commons/crypto/src/test/resources/crypto2/shrine-node1.crt
A		commons/crypto/src/test/resources/crypto2/shrine-node1.csr
A		commons/crypto/src/test/resources/crypto2/shrine-node1.key
A		commons/crypto/src/test/resources/crypto2/shrine-test-ca.crt
A		commons/crypto/src/test/resources/crypto2/shrine-test-ca.key
A		commons/crypto/src/test/resources/crypto2/shrine-test-ca.srl
A		commons/crypto/src/test/resources/crypto2/shrine-test.jks
A		commons/crypto/src/test/resources/crypto2/shrine.conf
A		commons/crypto/src/test/resources/shrine.conf
M		commons/crypto/src/test/scala/net/shrine/crypto/CertCollectionTest.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/CertDataEncodingTest.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/DefaultSignerVerifierTest.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/KeyStoreCertCollectionTest.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/KeyStoreDescriptorParserTest.scala
A		commons/crypto/src/test/scala/net/shrine/crypto/NewTestKeyStore.scala
D		commons/crypto/src/test/scala/net/shrine/crypto/TestKeystore.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/TrustParamTest.scala
A	(dir)	commons/crypto/src/test/scala/net/shrine/crypto2/
A		commons/crypto/src/test/scala/net/shrine/crypto2/DownStreamCertCollectionTest.scala
M		commons/protocol/src/main/scala/net/shrine/protocol/CertId.scala
M		commons/util/pom.xml
A		commons/util/src/main/resources/reference.conf
M		commons/util/src/main/scala/net/shrine/problem/Problem.scala
A	(dir)	commons/util/src/main/scala/net/shrine/spray/
A		commons/util/src/main/scala/net/shrine/spray/DefaultJsonSupport.scala
A		commons/util/src/main/scala/net/shrine/util/NonEmptySeq.scala
V		{commons/util/src/main/scala/net/shrine/util ← qep/service/src/main/scala/net/shrine/qep}/TrustModel.scala
M		commons/util/src/test/resources/shrine.conf
M		commons/util/src/test/scala/net/shrine/problem/DashboardProblemDatabaseTest.scala
M		hub/broadcaster-aggregator/src/main/scala/net/shrine/broadcaster/SigningBroadcastAndAggregationService.scala
M		hub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster/SigningBroadcastAndAggregationServiceTest.scala
M		install/src/main/resources/shrine.conf
M		integration/src/test/resources/shrine.conf
M		integration/src/test/scala/net/shrine/integration/AbstractHubAndSpokesTest.scala
M		integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsFailureTest.scala
M		integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsTest.scala
M		integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsTimeoutTest.scala
M		integration/src/test/scala/net/shrine/integration/NetworkSimulationTest.scala
M		qep/service/src/main/scala/net/shrine/qep/QueryEntryPointComponents.scala
V		{qep/service/src/main/scala/net/shrine/qep → commons/util/src/main/scala/net/shrine/util}/TrustModel.scala
M		tools/scanner/src/main/scala/net/shrine/utilities/scanner/ScannerConfig.scala
M		tools/scanner/src/main/scala/net/shrine/utilities/scanner/ScannerModule.scala
M		tools/scanner/src/test/resources/application.conf
M		tools/scanner/src/test/scala/net/shrine/utilities/scanner/ScannerConfigTest.scala