Skip to content

Commit 1b97b41

Browse files
authored
Merge pull request #74 from fccn/rcaap/bugFixSherpa
Fixing Sherpa certificate update
2 parents f5fae89 + 9b48281 commit 1b97b41

2 files changed

Lines changed: 72 additions & 0 deletions

File tree

Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ EXPOSE 8080 8009
116116
# Give java extra memory (2GB)
117117
#ENV JAVA_OPTS=-Xmx2000m
118118

119+
# PG20260206: Adding Certificate Authority support for Sherpa - Open Policy Finder
120+
COPY ./src/main/resources/sherpa.pem /tmp/_ca.pem
121+
RUN openssl x509 -in /tmp/_ca.pem -inform pem -out /tmp/_ca.der -outform der
122+
RUN echo yes | keytool -importcert -alias startssl -keystore \
123+
/opt/java/openjdk/lib/security/cacerts -storepass changeit -file /tmp/_ca.der
124+
RUN rm -f /tmp/_ca.pem
125+
RUN rm -f /tmp/_ca.der
126+
119127
# Link the DSpace 'server' webapp into Tomcat's webapps directory.
120128
# This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
121129
RUN ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/server

src/main/resources/sherpa.pem

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIID6jCCA4+gAwIBAgIQD6+OMf36x60/jnHGiak2tjAKBggqhkjOPQQDAjBRMQsw
3+
CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSgwJgYDVQQDDB9D
4+
bG91ZGZsYXJlIFRMUyBJc3N1aW5nIEVDQyBDQSAzMB4XDTI2MDEzMDA2MTgxN1oX
5+
DTI2MDQzMDA2MjQzMFowFzEVMBMGA1UEAwwMc2hlcnBhLmFjLnVrMFkwEwYHKoZI
6+
zj0CAQYIKoZIzj0DAQcDQgAEozWBXDYObA+u+/ni0R37Bl/5zVCdjdTDDpypKniI
7+
akak5I59f4JCBwhAwgI+pEC+/FhnjakTbBgBGnYBro9O2qOCAoEwggJ9MAwGA1Ud
8+
EwEB/wQCMAAwHwYDVR0jBBgwFoAUgwP95/b1Sk0VQfTtIhbTMgo+ymYwbAYIKwYB
9+
BQUHAQEEYDBeMDkGCCsGAQUFBzAChi1odHRwOi8vaS5jZi1pLnNzbC5jb20vQ2xv
10+
dWRmbGFyZS1UTFMtSS1FMy5jZXIwIQYIKwYBBQUHMAGGFWh0dHA6Ly9vLmNmLWku
11+
c3NsLmNvbTAnBgNVHREEIDAeggxzaGVycGEuYWMudWuCDiouc2hlcnBhLmFjLnVr
12+
MCMGA1UdIAQcMBowCAYGZ4EMAQIBMA4GDCsGAQQBgqkwAQMBATATBgNVHSUEDDAK
13+
BggrBgEFBQcDATBTBgNVHR8ETDBKMEigRqBEhkJodHRwOi8vYy5jZi1pLnNzbC5j
14+
b20vYWU4MDFlZDFjNTViYjU3OWQ3OTIwOGIwZDc3MmFjZmI4Y2MzYTIwOC5jcmww
15+
DgYDVR0PAQH/BAQDAgeAMA8GCSsGAQQBgtpLLAQCBQAwggEDBgorBgEEAdZ5AgQC
16+
BIH0BIHxAO8AdgAOV5S8866pPjMbLJkHs/eQ35vCPXEyJd0hqSWsYcVOIQAAAZwN
17+
lparAAAEAwBHMEUCIEae9T1yjn1CWj6kZiL93mSXY7tEvN9Hr1+Kq/8MlDHDAiEA
18+
8Y6gDJMzxaDNAzrLYq4a7uGLhbWg9Oqpg9HG6euJGF8AdQDLOPcViXyEoURfW8Hd
19+
+8lu8ppZzUcKaQWFsMsUwxRY5wAAAZwNlpbEAAAEAwBGMEQCIHfiui0xTRtFdbVG
20+
3g0J1H4mwTUm8WHvwB971cLYu/EUAiAsom/c3l4lZb7YnsTER+RuThGwlNMnyPlH
21+
zbyWW+yNKDAKBggqhkjOPQQDAgNJADBGAiEAtXgfoeYTHQYa8OJf/Ccrx+MR+1w9
22+
GjmqAryze57xOAMCIQCPBLvIRGfrGP0M3rP6dqzAbdvWPBZp+/e/vfW2Ajb//g==
23+
-----END CERTIFICATE-----
24+
-----BEGIN CERTIFICATE-----
25+
MIIC4jCCAmmgAwIBAgIQMe7oivuHzZ74M2YEdD+bJzAKBggqhkjOPQQDAzBPMQsw
26+
CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSYwJAYDVQQDDB1T
27+
U0wuY29tIFRMUyBUcmFuc2l0IEVDQyBDQSBSMjAeFw0yNTA1MjkxOTQ5NDVaFw0z
28+
NTA1MjcxOTQ5NDRaMFExCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9TU0wgQ29ycG9y
29+
YXRpb24xKDAmBgNVBAMMH0Nsb3VkZmxhcmUgVExTIElzc3VpbmcgRUNDIENBIDMw
30+
WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9HRQUjiNCkybPcNCJ17Eecqw+XVlS
31+
gd8c9dYludZ3B4ULjRKxKz9AuR9yBuD/QFIKk0n4yXGwfu7go0VRGER0o4IBIzCC
32+
AR8wEgYDVR0TAQH/BAgwBgEB/wIBADAfBgNVHSMEGDAWgBQyosfYWIv/f8A88lVp
33+
M+zOzB+8lzBIBggrBgEFBQcBAQQ8MDowOAYIKwYBBQUHMAKGLGh0dHA6Ly9jZXJ0
34+
LnNzbC5jb20vU1NMLmNvbS1UTFMtVC1FQ0MtUjIuY2VyMBEGA1UdIAQKMAgwBgYE
35+
VR0gADAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwPQYDVR0fBDYwNDAy
36+
oDCgLoYsaHR0cDovL2NybHMuc3NsLmNvbS9TU0wuY29tLVRMUy1ULUVDQy1SMi5j
37+
cmwwHQYDVR0OBBYEFIMD/ef29UpNFUH07SIW0zIKPspmMA4GA1UdDwEB/wQEAwIB
38+
hjAKBggqhkjOPQQDAwNnADBkAjBkW/dgTArl36px6LVMWzfHLv0pFD+P9BoOYzir
39+
Z2aS2IwsQPHb0rQdZMY5NghTTk4CMCiwDU71fhtYVRulUc575HJroLXgj+BkpkBu
40+
bdHnb2+aPpCH7LP6QNQ/Xm9NiqdxAw==
41+
-----END CERTIFICATE-----
42+
-----BEGIN CERTIFICATE-----
43+
MIID0DCCArigAwIBAgIRAK2NLfZGgaDTZEfqqU+ic8EwDQYJKoZIhvcNAQELBQAw
44+
ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
45+
A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
46+
BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNDA2MjEwMDAwMDBaFw0y
47+
ODEyMzEyMzU5NTlaME8xCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9TU0wgQ29ycG9y
48+
YXRpb24xJjAkBgNVBAMMHVNTTC5jb20gVExTIFRyYW5zaXQgRUNDIENBIFIyMHYw
49+
EAYHKoZIzj0CAQYFK4EEACIDYgAEZOd9mQNTXJEe6vjYI62hvyziY4nvKGj27dfw
50+
7Ktorncr5HaXG1Dr21koLW+4NrmrjZfKTCKe7onZAj/9enM6kI0rzC86N4PaDbQt
51+
RRtzcgllX3ghPeeLZj9H/Qkp1hQPo4IBJzCCASMwHwYDVR0jBBgwFoAUoBEKIz6W
52+
8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYEFDKix9hYi/9/wDzyVWkz7M7MH7yXMA4G
53+
A1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEBMB0GA1UdJQQWMBQGCCsG
54+
AQUFBwMBBggrBgEFBQcDAjAjBgNVHSAEHDAaMAgGBmeBDAECATAOBgwrBgEEAYKp
55+
MAEDAQEwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
56+
QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsG
57+
AQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQAD
58+
ggEBAB4oL4ChKaKGZVZK8uAXjj8wvFdm45uvhU/t14QeH5bwETeKiQQXBga4/Nyz
59+
zvpfuoEycantX+tHl/muwpmuHT0Z6IKYoICaMxOIktcTF4qHvxQW2WItHjOglrTj
60+
qlXJXVL+3HCO60TEloSX8eUGsqfLQkc//z3Lb4gz117+fkDbnPt8+2REq3SCvaAG
61+
hlh/lWWfHqTAiHed/qqzBSYqqvfjNlhIfXnPnhfAv/PpOUO1PmxCEAEYrg+VoS+O
62+
+EBd1zkT0V7CfrPpj30cAMs2h+k4pPMwcLuB3Ku4TncBTRyt5K0gbJ3pQ0Rk9Hmu
63+
wOz5QAZ+2n1q4TlApJzBfwFrCDg=
64+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)