Better support client certificate authorization

https://www.argeo.org/bugzilla/show_bug.cgi?id=160

git-svn-id: https://svn.argeo.org/commons/branches/1.x@6314 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/argeo_node_web.properties b/demo/argeo_node_web.properties
index 57f812aeb390e9d49437428ebd76a0f879cd21af..a63e68febb17d1e70f4b94eb07862e737a7faa55 100644 (file)
--- a/demo/argeo_node_web.properties
+++ b/demo/argeo_node_web.properties
@@ -18,7 +18,7 @@ org.springframework.osgi.web.extender,\
 #org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective
 
 log4j.configuration=file:../../log4j.properties
-#argeo.server.tomcat.config=file:../../tomcat-server-ssl.xml
+argeo.server.tomcat.config=conf/default-server-ssl.xml
 
 argeo.i18n.availableLocales=en,fr,de,ru,ar
 eclipse.registry.MultiLanguage=true

diff --git a/demo/log4j.properties b/demo/log4j.properties
index 21c1ca86239d949e8014a1cdd3daa9edf4a68718..9f9b7c645bbebddde4b5d2b81134d8cc6d7518b9 100644 (file)
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -12,6 +12,7 @@ log4j.logger.org.argeo.server.webextender.TomcatDeployer=INFO
 
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
+
 log4j.logger.org.apache.directory=INFO
 log4j.logger.org.apache.directory.server=ERROR
 log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR

diff --git a/demo/ssl/ca.crt b/demo/ssl/ca.crt
index 4b46c47fbe7d093797bc5fbeba560e51b272a26b..1aef41837b4046fa0affaf81cbf95154299c5c18 100644 (file)
--- a/demo/ssl/ca.crt
+++ b/demo/ssl/ca.crt
@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+gZlju4Nu4PKD2RWyBihI4YF1AA==
 -----END CERTIFICATE-----

diff --git a/demo/ssl/ca.key b/demo/ssl/ca.key
index 0888ad39b002f935717b237b22e35cc10fe6faec..2effee0e403116a3fd88b21236739f3670f2151f 100644 (file)
--- a/demo/ssl/ca.key
+++ b/demo/ssl/ca.key
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,EBD71584ADEE8FE7
+DEK-Info: DES-EDE3-CBC,1E365E4A0FD2EC89
 
-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
+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
 -----END RSA PRIVATE KEY-----

diff --git a/demo/ssl/demo@demo.crt b/demo/ssl/demo@demo.crt
new file mode 100644 (file)
index 0000000..d9f0104
--- /dev/null
+++ b/demo/ssl/demo@demo.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFfzCCA2cCAQQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
+bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
+CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMzAwNFoXDTIzMDUyNjExMzAw
+NFowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANSJkQxDTALBgNV
+BAMMBGRlbW8xHzAdBgkqhkiG9w0BCQEWEGRlbW9AZXhhbXBsZS5vcmcwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBuEqxINyrCP2IauWReizNWl6J+WgV
+pqTAViqlEtbSbGCzvHE4eF07uCazWmAwWRmXxwf2h4M3siC8Q382n7ri/eS4mijk
+kw7FxoQh1W/jLDFcZ2orY4bz+DoexL+ClVAf8AKBQ68NNbf1aZnUctnDx5Ymrzq/
+KHvgUAIsRmcRzhE5mjWxem33iAVibrQ6LhY5tNDw+VfXZ0IzvTl/ZHfKyOGq4NTl
+21C0iWqksj6sJtvYv88wSHmnzokOXb5rJo5q07HN5b5eHuoAM74SS36ScXpQixDS
+Z4tCjxzo/QwRqQdlWJBv9PSPEq4HNHlCu/zbWZNCbRVKmRf0qYq9dxjxunyj+HjT
+Dj4OfvpmOhTrX78x9ZDOfWmYV/PpoyQ+5PKDhXfFYRGAY97CN1UlQhccdnJCgM3o
+bYkQ+fDXXvgNQLazbOVmeRd5is4TXdcNJIN3LcXXdEOa+O6X8fVTwxzXMD8Uy7fo
+CRvhCrF6gqZZyt+pIJMucLzydiCJHqqDK0xjJ4wtfJNGEyIDJ82hUDEae9X4ao6m
+ti146PH1zbKWS2EYaoEFeXgIqDiU8dKIZNrTd+nflIGd/TLf3LgY43qGEwd/oWtd
+I1hICu173WGdPNnZWbvJtqb4nHag2ldd+jnYHFFF0jnH+neRq4lqW+CAFjWz7c8J
+NtCr+RBVS6bYjwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAO6FbFXoYrM1OvUHdF
+mul7cP7jVys3dRNfIdTcKF9tYf5sWS7/2PbFeQ+bjLGxQJcZhQ8BvK2J00/+kExo
+JMEFqQ5BZRorwdnrQxJNJcHrvrQ6ZTaiBhuyktbWGblCAWkuhqw6NLYxhcE1Wq6s
+6w978F/qHCvqGSi1QkVX+9WjVx48K2JqBRKR04THWlgf+llOJsuMv4Rk75iH385L
+FNsQAXIquQHqgBDqKjcSAR0VAQSXV0gnMadaUrHv7H+QqsYo0zp19cX/WF0HNti6
+GHk+mCnDeZh6Z2z7xii+9fQGIMgQ8YhAJwzOhbk72y8WMqfHtFqcY1KnZq52c7wz
+3+kMx+XJ6t6YiJnWAWs4M/mk7RVPOvNqOAh8y+pnd6tZEzdRcvuDiv+U/HwNS6TS
+nEsUHK0rwWD3Sjfwe9LO9TMxdSZkWePlY2v5oAL4YxJnJGfbeBo/OynUkIa0fRXf
+FtKdAENfpijpuNiN3O92q8FwXpLjr38aTHy0o5n2Zrlly7ydGwRXJ8P7FdbGRXj5
+UPaN6b808kysE9zS6BA0XMslLPqQrFgqZFK2fnv/QW87jyXQkTAAgTVrHODJXVsr
+YLIpWTmykOxyNFGYiT9BCxHXTO7LvlGdK3OqRwbzTcD+CHKZsUxALg/q7FbSBS6i
+OZrgJYlxzdsI061+rLsaW02FOA==
+-----END CERTIFICATE-----

diff --git a/demo/ssl/demo@demo.csr b/demo/ssl/demo@demo.csr
new file mode 100644 (file)
index 0000000..4ace678
--- /dev/null
+++ b/demo/ssl/demo@demo.csr
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEyjCCArICAQAwgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzAN
+BgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANS
+JkQxDTALBgNVBAMMBGRlbW8xHzAdBgkqhkiG9w0BCQEWEGRlbW9AZXhhbXBsZS5v
+cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBuEqxINyrCP2IauWR
+eizNWl6J+WgVpqTAViqlEtbSbGCzvHE4eF07uCazWmAwWRmXxwf2h4M3siC8Q382
+n7ri/eS4mijkkw7FxoQh1W/jLDFcZ2orY4bz+DoexL+ClVAf8AKBQ68NNbf1aZnU
+ctnDx5Ymrzq/KHvgUAIsRmcRzhE5mjWxem33iAVibrQ6LhY5tNDw+VfXZ0IzvTl/
+ZHfKyOGq4NTl21C0iWqksj6sJtvYv88wSHmnzokOXb5rJo5q07HN5b5eHuoAM74S
+S36ScXpQixDSZ4tCjxzo/QwRqQdlWJBv9PSPEq4HNHlCu/zbWZNCbRVKmRf0qYq9
+dxjxunyj+HjTDj4OfvpmOhTrX78x9ZDOfWmYV/PpoyQ+5PKDhXfFYRGAY97CN1Ul
+QhccdnJCgM3obYkQ+fDXXvgNQLazbOVmeRd5is4TXdcNJIN3LcXXdEOa+O6X8fVT
+wxzXMD8Uy7foCRvhCrF6gqZZyt+pIJMucLzydiCJHqqDK0xjJ4wtfJNGEyIDJ82h
+UDEae9X4ao6mti146PH1zbKWS2EYaoEFeXgIqDiU8dKIZNrTd+nflIGd/TLf3LgY
+43qGEwd/oWtdI1hICu173WGdPNnZWbvJtqb4nHag2ldd+jnYHFFF0jnH+neRq4lq
+W+CAFjWz7c8JNtCr+RBVS6bYjwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggIBAKYk
+c1LiB2iNqjJMPEjzJ0wpKizHoqv7Tt55Slz4Q9bTgTYmevt8SIpQCKK+ZtMxCPIy
+9tfqjsdYqBxahfXnhXUDQQOYEAKcffEZd/c3LX16kOupximycFOj0iqJDe5VZ/NJ
+7fRXlJqqkufoQQ3OqPYzS/G5mP61gadvReAkTh78StlWMNxwg6wYgQ3p4ZD1GKNI
+M7A1Z99HyJeRZcT+yx1wuyvX2MJY15Kg6m9xaM1N+q4BJ82+u76pNX+pTw6A12mB
+XhmIKqRh+KN7YGSVMtU4dBwHMlZD3CRiGUE9RFg/5aqJeXZgCVnLgzTzJUFQqRqZ
+OehYdizkI6TgTLl3xIJWHFqYc5GhY9NwghYn0BjiC/8xpOmj+soAG4hDkydejtf1
+8lFeTxW8Ga560zjvaUOqntQTLHiAnZai7lVFxE+o3/b284OYu5wWyAFh9j+eE7qP
+pnObCpeFanlsuTnQIXZD4KcojI33dmBXIVhCfe0cvtDEPLl2MYJNguO40tJwPCzL
+JBpdwqh+rBKQjX+pn56js3BgB4qrcQnWGEHWOb/Z+ooRkaIIliRLBTS5DbbnsQWp
+jyVKVhTVLNdp4L2oy94hGi9wJSCujXyBFXH4+e3HpYrZwGSJKrpnRPChm9XW520A
+EFgLzv2Oh0zXJiBJ+EtVwWfkDCImakD1u5QAHW7h
+-----END CERTIFICATE REQUEST-----

diff --git a/demo/ssl/demo@demo.key b/demo/ssl/demo@demo.key
new file mode 100644 (file)
index 0000000..b1066d8
--- /dev/null
+++ b/demo/ssl/demo@demo.key
@@ -0,0 +1,54 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,955EFD4E985DC326
+
+TXxk9gZOkjLsP4MZmg0HWADP97beNLBrHBLwNvWVzFGmNcuLrAb1r6+OlwIVR/Hl
+BAFwygYvwvo2IL68I2hM+pW9wLY6WAit2CvdWs5J+q0MMc6kXilF33PvmW6G0raB
+XurT0Q0w7TcIXmjMo2k6CCnHGCUxIsYjXIKF7LdC7ERR2wCRUgtuns33/Xf7kfIg
+AEpYC5+iJFT9/ZvXm8Ezod0qG3LZ0TmRMRkWjbBOpHqWVCgTwddHZ2hCF4kNubxC
+DYL0UlDru9JgrW9ezAAloyG0GaiqPyCCkUQGw652e99OllYsfCsGQaoRNPwk2ytA
+fss7GyjymlxtjEdwWnVxngUGr+u+cp9QDD7dkSDm0uMBCVjtSg4MGvk3betn+JIt
+MYbEst4Qr0llFV7jMWt5e/EBllErrPipthfpd2o6JUxv5PNCDEbeKRSU+TZ2KuT5
+4uj8MSA8nbixQf063Q8Nz5sd9Aq4Vc+J9Juyu4fbUAI/PAL71fR3HC0hou6plxev
+EXIk6cAZLhzRKBnmwW0Srh/fp7dAlK/btQHoHVtx4E+uT2Ct+5xm63wMJLE5Z+Gw
+6xr0L9CCrnCicekEUoVdED03+U0r+lfP7nOmk/CgfIYpTP+RqsBXTVcwe1tvZqMN
+RLbL7iDCxPrRFwRs51sM2MS5v/3S4r1yTJ/ijgErhrf4shtR+AO9cqkZkLwLtTmW
+wKgWbRVnt8ITRRqqyBRjwBpmOWNC2YfkJrlDcm3rzn1fWWGOOQHlYjDYjpgVJfte
+v/HEC9Z+J82QQ73tyMUrNyJqeiyKdjUHY9T4oS13goGe3T+UUJ7ReYojmwFKCSu9
+GYNC/+7B2kPTbXVwKG9fZ85W7GdjGzy7ci7IsT95znKbPD7gmrr/5L+iYPqLv+R5
+WD9zNsyPpMZvatJRxjH2EdhhWoqvhY+M/k53AdHiM45iG6MVzKxPOlMlEsD2aiMb
+3zGUINsOm4Js77klemGqfd0uEBynypqhIQOoYnTTHnpqguandGkeyAZ689CncP3o
+pg3u3bZVoH5PubxWAFzxqpmrkk71oPaflbT6AbXGGpm9sjSPVKGm67B1yVMRtJph
+GjXuwiDRqX1HwDIMqQZrJKZv0XcEUObruKODryHuxbAA5IWTfZQoGfVei1acn5/7
+Q7MNqzDN2Rzgk4hOWuTSj3IFWzy432qfA2KQFcU37E5cBKnKq/rZp1L9O2wHY095
+4bXLugJML3pQPGg+VSw5RMhmN0RHh71W0aSQVAbOAu/fhCbrOAA/jHf8RN6gH+v2
+pZp1FZU0Bw5So/E9B2ubaTmBEfsAAnPd56jTAsHsqL8x4omXza96WGOlzqQf7W9x
+I481If4hwNl6KEeRb0guiOp0PFq9cfnjvhkbRVAiD5PodjpttAd1ZTvnJA5BDvdx
+v4JaNgKJ286I/2R65njiWtfDREwiStQzX+RjkFQGAQno3FYQiVajYg+URl8yul32
+Sn1ovaVGoT4AzM4UM6xGiAr5mQgZp75/BIYoFk3eit6025mKNfVOsljFnFhS0Bw7
+oRtfKE32TuEMmIfEMP02Ppofk3vBoLQtsgBpYLCYNy3wzzteAsXEFaAOaIFtHDXv
+TI8aHif0hgEXr6gTpQ7uqk5Kmo/9AAM8/5bbDd83Fk0m6Woi1EA0Ac2nv2TSpTeV
+MHy4vk+QJEmaDcKYCn8BlpgJe5b3CJONdt5yXGpfZISxhRQaWpv1dCSFxfARPGSy
+TPZ9jHU5fS+iegOIcb25dr0bncYy5+UKCoaW05L/z1a8Fn3AmjS5YkZBYqmsI4AX
+tkfcRKlVRGuOe3A1borQvC4pB41wlv93GKxF9xltJ7D0G/kNz9BRLvIoF7xYhzBe
+Jyp8SXUwLkAW3H1zIAf8A1rQNyP60txHXcR7HC3GGx6Y/c11L3XBzniD3VhBVZLc
+Z5ndKINz6wrmi3z87GFsBEe0aRhvXanxgBN1vOD2jhWAwOtsXAP0Pz8VZq/rCnIQ
+BKff0VVwRPqpCasgknY4hs6PmteMvOSynTS3v85a2++LrL4vE0MRMHUusY9jIUJn
+plSF9VOsjMS9eeLbch2FNnmEhnn+Sq06uZEZxgweocapm5TvU9S3b5zXWht+4ECy
+Fbe+hKcsls7B9p/sI564ylWtfy/JOsJ4GfsLaLwytbo8tUU9Z4t6bjiBXRUYBS7D
+bVep0ukngR1xeiML/887MGqN0G4RHgBhbdGvBKX0RYArMl2PTNebysuaabdYy8VB
+mrlodPL+OPrly23IHws6/48EiIugUgqTn0JtzZlAiRhK85b9dUHbnqxP9q6DOum0
+GYBnVivo+LZm+rVOPTB9SMEkZezoZZbV9US495vNQF27c85ERAXMi+qnwEmJZeff
+HqN7KzeK21coUNKrxx/n80lk0mCDX8M0BL1qQEH2iiE0wA0JZYm4cOujpmRtBJs7
+g+0Gd4qU9oQWVjbsr28wdFCBzeKvVdwi5+PVEtliSyB95ZLEFNQbOsomU986VllM
+AVYHDPmLfXVl+eUXFfdVNjnw+pXYGKhpicgJQYOunXOukdjmwu6byB7mR3e9IU/9
+BbrgWopv1ZKq/s/xvRsWih05nvXHKSeITVXUAHE4Z78Ia0ZRAj4qicJ/8XvhnJX9
+17G2nOPtPJFrOE+y+KXanBR+ZPNV8kve8hGxSzxcfvz9divRg77DCB81Jyi4LTXa
+l+p0xoM0UUS4per09zHHg9g8lHfjtaq/rge4KgV2uQENNCFjskCc8BjB9U7TYWun
+K9BNQC49p1lDESvStTDrvnX3Ckw3wsvoR4d7fGMakuZcoNF9VAH2YOi7VFBwaySF
+HB+NosmrfrK7izewfNuE751mIWPBek/5mkMwjdMl2Uch+HchGLFPMTrZSGjl8tlJ
+wzbtVP026Iutm+CDXglZq9OV0pk5NR3zF7444m9xxuzHQypRvklDd2OGwdwMoMCJ
+k370YS4dvIlXtwlW39WPyYwWyGmqpfYO2Fj5Su4Pzwz4c/LD8mUVD1scNXeE7dgD
+n1leMfMX5O1elhs9/FgNFH2ntrU0gRGORbwyD+yjryYxv3KOHic7uVY+JsAlY/JA
+ciqvTgSc49XYari0dMCE/rBAwTpKnEKDKB4pI/o6A+ARPGdSj6UThGRS4538d7cB
+-----END RSA PRIVATE KEY-----

diff --git a/demo/ssl/demo@demo.p12 b/demo/ssl/demo@demo.p12
new file mode 100644 (file)
index 0000000..9f60819
Binary files /dev/null and b/demo/ssl/demo@demo.p12 differ

diff --git a/demo/ssl/root@demo.crt b/demo/ssl/root@demo.crt
index 1f8a18c0ac1f81b94f1c578fde8b38fb5fa7d2b1..b79404bc54253cdbaa72f46d50f17b41b4fc1ad4 100644 (file)
--- a/demo/ssl/root@demo.crt
+++ b/demo/ssl/root@demo.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFiDCCA3ACAQMwDQYJKoZIhvcNAQEFBQAwgYsxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEOMAwGA1UECgwFQXJnZW8xEzAR
-BgNVBAsMCkFyZ2VvIERlbW8xFjAUBgNVBAMMDUFyZ2VvIERlbW8gQ0ExHTAbBgkq
-hkiG9w0BCQEWDmRlbW9AYXJnZW8ub3JnMB4XDTEyMDgxMzEzMjM0MloXDTIyMDgx
-MTEzMjM0MlowgYcxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNV
-BAcMBkJlcmxpbjEOMAwGA1UECgwFQXJnZW8xEzARBgNVBAsMCkFyZ2VvIERlbW8x
-DTALBgNVBAMMBHJvb3QxIjAgBgkqhkiG9w0BCQEWE3Jvb3RAZGVtby5hcmdlby5v
-cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCrOC1BS1Qotq9D5NAg
-5761ATNjMNMsg3SFkbnVIY5bzraY+lxs2qW5I9BXEHGDIGXJoden8VmBI7Bd5vCE
-8yNu8VlhfwNOuDF2NQVCSzUU7LUzJuEW/CBo1zgES2RYaH8Rt6+/4VVEm6DFI+Dr
-7GVeJh/f2LIZuKvurz8wyxvbGAXeF1p6lerS5/Qw4JE/wgVLCecD92WP3zbMyj3I
-Of9njNJQ8w8lNVcu4LX0pNQHFyTotasMPAgnu6YZ9uWGjwb6fItl8JbFZSuQER1B
-d7stjbzvcFCBJ/ZdWm237nqfQXLakOqJvUEvzo1cVcDW8slTX/Ird2LKN5VslPyV
-pBxRUT8FhOANVnGP6E4iqhRMYyRW1i0e9+QRvhhwVIrC6NpMCYnZm3DponNIzZGF
-B7cHkT//vS2w4r5OtLVb2RleXGzxLag6GsVNyI74Abi4bsM/H+9CKN6NsSXn07BB
-kJERdOBO80L9W7zFhJ3IVRCIXGujCcOF0WZAareWESI1CVOPMgC32xdBbw/IrnGv
-dUc5BdsOInjsOcO17LbsNpEDQQavF5SUR1SLAmsrftQoYqtsBjzCiVcAFCOF8lwk
-lcEEWLSRwCOEtsieBtxKz7UvizFPn34iqvUwoN5BdceJQVry4wjXfraScIjnrHv8
-/6pvW/N63WJJODhQVEK499BM9wIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAy1dBM
-ViLw4/eBUTtpZvlMotw0booS6opEKxAUuC7YDMkKwW4rqDxJTpyVKgC61q4Q5wyH
-fripqwJPgF6+aqDlRE3YHbHFHq+iKYSD582MIy7Bb1kmqvw+CkSWgaZFJiRuDT/2
-QCdEcWPYFRWP23/GuNZurd3M8GA+7Pd10XnqYbZgXLAdVVz+I4JzFT9KReVOY4Ne
-ZWSnzXb092FCpy/REUg0vUKKze5GzCiBfTTEAb4CpnY8HHlvcBsL2tNABhcP+gu2
-b7/LlhRZqlMaidJhGz2UH6WqXWweYce7ldpZ8khuxF2Rbnb0upIUuJgCKeJ1HckE
-JIVTiOJ7ZV2KSphpkVgiGqJidonTPOY46lihk0ZqGnbXfHXtI4JYKorLikefztS6
-8ExVVpbHZpTz9plqxc7/VpNqLGLwwDXRkIEMBR0OgIecVnSTe5vCdFnGZACwqHa4
-iy4hDmf6iBb7CmOAcP5W0w3yZ/p/jrc2K2lKglcU161pR7uCsStLaRh5Mec9MGpx
-K38Qaecm8NtC06I5aCPMA+5UrXdrsNvmeKZUwaztskkBzV9RibW/ogfoZeDpCh66
-HHG4Tgpkra4X82D6g71Mtkl3ez3tlFiUR9K0cuxtDxwaavPAmUo7tKOAG1UBgRlS
-t8DoCPRbx0o98O/x6g37H1UWe4sEiQSUaW1LiA==
+MIIFfzCCA2cCAQMwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
+bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
+CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMjgyNVoXDTIzMDUyNjExMjgy
+NVowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANSJkQxDTALBgNV
+BAMMBHJvb3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5vcmcwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDjfJpz+c2ompElZtBWC5HUJ6NevhMm
+I7VCAZjMEa8l64cCXlULOyKYbEZ2oQupg5iqHVbEK1d4UJ7b2EWTFc8bZT+cQODL
+7x3hPJ2856PNSg2Rcsna40Vy/1jieRE1gpLVZBi/myFuCBU5uQkhja+VikgIltfX
+uvYilMEkcEVSQniFJCB91xaNPWPJwuyy5JEMoRXprCjHmChaE+MGnWOXyU5+nSp7
+FuLAOZDXbNi+I8J01q2W+iWVlqvIKAa5ogq5TYayo9foVX6ftnNlkoG14gJUGn8C
+CNSAx8ZGNR16952H1UGQycDXM7T3T1MMYT8gB9qDK90ko1EgvITy2UPyWGhTxh9U
+dKkwpenVgn+hDER5ObTlDmSucCooVKZCAITimb4TjJm1pRfupaJlZfKboFmnmx2Y
+4JvZdbM7sTcCmFRv6P0UEJ3MSptzl/GBqSYFyTKmsVWq1NaRzytUKkTQP3TDpf9c
+vtJKu/CPUWKVtamf2d4U+34MLKIQ2zDRkUWDmEypjHitW9y4PlBYVtZ2ks1rdLCl
+ei7cDgwG6uwLZ9FSjHQgy0BF0lVHKnefrR+c1HZ8/vg12pDtmLvP9tL3rxWQ+fGj
+PluaIgPh/moMEKAWDHH+EeAlJ5mmutIU6HS8cL9G/doV7wfqx7TNGhbCbRIawF+x
+jBYCwiRDmNocGwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCm+WvHykMS7opbbfDu
+reOEt+2i/jyWuPPJB51HheyCQtV5MXyuCRflZpJJdI8iWb3DtayKCI18oK7SakcN
+hVGY+3GJyr5yYVsoeRbyFUgz4apBLb2CeEC7rHbbC39hYVc+FxIUbGiP70dm1TJW
+dZEWeyINScR/YVLitx99g6AVByRjaTDpSDr+Rbw0HWZiuJ2Sb7DqCdwaH5nJqLqN
+N8Vx4+vCCDyOD7kH7cqF3eJ6qepBIYPHib8IAqyLFDcd1OXLMQHv3rrYcQ0WM34P
+NkF7wTO1I8gzpcFyrtOBLOyx/wkoxWhqVcWzYXQrgLbgwp8Z/bJz9MyBnqX2NWq0
+qrGoRBqyLkT4W6acJ2SkgCqMLXhMXfne6wziG+nFiYexeKL+cLEB/CkarxRMEta7
+Hyb/zfWLrXATznjeeXanbgBC9f32Xo2IttLw7hPTAkOqulm7/k/U72/n21g9dLdR
+EtmfzYuDZEOH2QdBqPkrwuqY20t4qvqJITomE8GDFqguJFF5T0h0BS04oSA24J/m
+pwuaccHKuo2j7wapWhqQWZj+3CwYqZDKxIsmWCXAsreUj0GmZEKCgdOI3zzNpAI3
+F6puzfejkHze2rE9Obu71c4q0ibmo8MPx7ovoD9yIZPAvHK8HLiQaRNYP9xvv3FL
+g2zA6bTCQMYERNb1YTBv5xeuOQ==
 -----END CERTIFICATE-----

diff --git a/demo/ssl/root@demo.csr b/demo/ssl/root@demo.csr
index 54c05433e8dd8cf21321631dad2d1bcd084c6fd0..34c6cedad199b4858f612c7505053f2d7a0edbd1 100644 (file)
--- a/demo/ssl/root@demo.csr
+++ b/demo/ssl/root@demo.csr
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE REQUEST-----
-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
+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
 -----END CERTIFICATE REQUEST-----

diff --git a/demo/ssl/root@demo.key b/demo/ssl/root@demo.key
index 0c6c32d98fa0aa0c98ad7cc6dc654fb081f17744..65923d77ec847079867e383c3b856dadd7399589 100644 (file)
--- a/demo/ssl/root@demo.key
+++ b/demo/ssl/root@demo.key
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,8B121EE89E94390B
+DEK-Info: DES-EDE3-CBC,4A5FB12597A1CBF1
 
-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
+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
 -----END RSA PRIVATE KEY-----

diff --git a/demo/ssl/root@demo.p12 b/demo/ssl/root@demo.p12
index 889f0b4165a2e3b0d2073ff1e93534bd06d32fbd..d9a86030aa0157b7831ce62763224309ecd28948 100644 (file)
Binary files a/demo/ssl/root@demo.p12 and b/demo/ssl/root@demo.p12 differ

diff --git a/demo/ssl/server.ks b/demo/ssl/server.ks
index cf0d090aa6e6f922a363c6c635f02302fc8c94c0..a28ade3c94995960ce41a23860fd5d872883b065 100644 (file)
Binary files a/demo/ssl/server.ks and b/demo/ssl/server.ks differ

diff --git a/demo/ssl/server.ts b/demo/ssl/server.ts
index 9af5fe41fc3c3b8f80d99b85e086dcfcbdeb6648..25f793667f7c739f8be40ce954025b1eb5be4b12 100644 (file)
Binary files a/demo/ssl/server.ts and b/demo/ssl/server.ts differ

diff --git a/demo/ssl/ssl.txt b/demo/ssl/ssl.txt
index 95a24ca3ff853f60999057785f1138e119f996cc..788ab49fa0a53f0d70fb90786b242003543fcc2c 100644 (file)
--- a/demo/ssl/ssl.txt
+++ b/demo/ssl/ssl.txt
@@ -1,21 +1,32 @@
-# In demo all key and stores passwords are 'changeit'
+# Password for all users and teh CA is 'demo'
+# Password for all key- and truststores is 'changeit'
+
+# Clean
+# rm server.*
 
 # Create CA
 openssl genrsa -des3 -out ca.key 4096
-openssl req -new -x509 -days 365 -key ca.key -out ca.crt
+openssl req -new -x509 -days 3650 -key ca.key -out ca.crt
+
+# Create Keystore and Truststore and add CA to them
+keytool -import -keystore server.ts -file ca.crt -alias ArgeoDemoCA
+keytool -import -keystore server.ks -file ca.crt -alias ArgeoDemoCA
 
 # Tomcat Server
+# (we must use keytool)
 keytool -genkey -alias tomcat -keyalg RSA -keysize 4096 -keystore server.ks
 keytool -certreq -alias tomcat -keystore server.ks -file tomcat.csr
 openssl x509 -req -set_serial 02 -days 3650 -in tomcat.csr -CA ca.crt -CAkey ca.key -out tomcat.crt
-keytool -import -keystore server.ts -file ca.crt -alias ArgeoDemoCA
+keytool -importcert -alias tomcat -keystore server.ks -file tomcat.crt
 
 # Root User
-#keytool -genkey -alias root@demo -keyalg RSA -keysize 4096 -keystore root@demo.ks
-#keytool -certreq -alias root@demo -keystore root@demo.ks -file root@demo.csr
-
 openssl genrsa -des3 -out root@demo.key 4096 
 openssl req -new -key root@demo.key -out root@demo.csr
 openssl x509 -req -set_serial 03 -days 3650 -in root@demo.csr -CA ca.crt -CAkey ca.key -out root@demo.crt
-
 openssl pkcs12 -export -out root@demo.p12 -inkey root@demo.key -in root@demo.crt -certfile ca.crt
+
+# Demo User
+openssl genrsa -des3 -out demo@demo.key 4096 
+openssl req -new -key demo@demo.key -out demo@demo.csr
+openssl x509 -req -set_serial 04 -days 3650 -in demo@demo.csr -CA ca.crt -CAkey ca.key -out demo@demo.crt
+openssl pkcs12 -export -out demo@demo.p12 -inkey demo@demo.key -in demo@demo.crt -certfile ca.crt

diff --git a/demo/ssl/tomcat.crt b/demo/ssl/tomcat.crt
index b05dd8c7c765d9115b27553b2765d2270b1c522e..0ce674b169159f63c90c5610c82f868246815e04 100644 (file)
--- a/demo/ssl/tomcat.crt
+++ b/demo/ssl/tomcat.crt
@@ -1,32 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFdzCCA18CAQIwDQYJKoZIhvcNAQEFBQAwgYsxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEOMAwGA1UECgwFQXJnZW8xEzAR
-BgNVBAsMCkFyZ2VvIERlbW8xFjAUBgNVBAMMDUFyZ2VvIERlbW8gQ0ExHTAbBgkq
-hkiG9w0BCQEWDmRlbW9AYXJnZW8ub3JnMB4XDTEyMDgxMzEzMDQzNVoXDTIyMDgx
-MTEzMDQzNVowdzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
-BxMGQmVybGluMQ4wDAYDVQQKEwVBcmdlbzETMBEGA1UECxMKQXJnZW8gRGVtbzEh
-MB8GA1UEAxMYQXJnZW8gRGVtbyBUb21jYXQgU2VydmVyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAoF1IzT1815UMzdlvMRkCUy/ISfwArbmGAvv5H1LP
-fPXF+YF6EpjKj74JwHhMGoB1j1BUvem5TeWxszU/mevmFCWvrmO83lBAlSNRX6iJ
-m3np3s2/rrtZg2WUu95ZGkRQ1elPRU9KY99rK+NlJH9X6Y6Bfoi5//OAyeZ+kIxx
-39sYXazAYYS9h+8D1mtSHoSFgLMy73gu4UIeon+GW6PbB+E6kQVlRjumBqLtj6a9
-t59T+coc4UStqmFCuPiZuMvbijS0ZBJxuNcaYATcCIjB/S0Pktfyjgxn3HzCLVtP
-KRskGHHfoxje5QHbH5sE5lEQPMFxuuj5C/9eCKs5+8ob06gNVn4u2SB27mLpafqY
-nJxAhGIqRymZSNwf0Nq7GcUj6OxPCzGG1RBV2Add9YpL4rWAeL1ftdNjRmvDwFpb
-dsY9fO8Oh+sKKsrypQZ0BAHWs+wWVHbgHWHLCv2uky43VRSM3kqBhNcHyc+PWjga
-+/5M+dqIyi9onoyrZ/dj+KaS5gS5u5dcpjoweb78r67+hJUw02VzZCXZdZZaadyi
-zTQ8SeGzob47TAgQ15r6PGcSYPhqcEnlu6FoT6IYWh55p1QjAGHmZs3GF93qhwM5
-/9i420gEvqZNegdOTVx+Q2s9VHV7QlMbAKXOaP0degikt5mQPrmmtikAFiwx4/Aw
-Gr8CAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAXEIZ1OpNWguFWdVn5ksTsw/tpm5M
-cTKBleyXNORrtAwZOo9+B60lRjdeOXGt77UAE5O/0EzR1DoUWs4btOHbHQEVNszM
-1GzudWuWawqcDpAaUKaXL0XjQ+dG1apDbq3MbEONkq1AjBtn3gUL4+Q+wFL6+G4Y
-sfAZkws2CQr1j0gTphAkbUDMtxJdOxSZybhTNgi5oShN46NljMvO9hhSbLMKAPrf
-hyEuyznSoGI3/9KVjK7dmmGAI/ieYc8mU1UIyEVUZPoECSBUJ/T7sFilbL6cFAsf
-IJIdvoBt/aW0+uVee0bZ1hrvYMbgj+Z6FzU7OX8mIbj0Sx9WD8kyoDgJjJ5AbVnQ
-XSlFh1WY99XurhokWtphs1Bmpk6c6alRV46NoAZey6c7UK7ugoMM9NNc+xD1+aK2
-k2bRFhu6LTeF5gyV3w9DA25CnXu7qZ6QiZ8Twav4GAPZIsKXqBx8+hEPN7QN9g0Z
-TlmZ0O25CpKRuYMjP6UI5DX3CvTI+UvlEZL5N9apOnTGh9FE3gkmy1I2gaVcuaW6
-HMXaRiMiZNPL/lJx8qgP8j1upiEtbmaL7bxYr1cql2s14YJJyfaoI26D8NGVkYSb
-BWSLhcjcL8TEwZ09r1geL7xodxov5h9KrgctMvcW7s/Co5xw9xIy8ktlanzDmaTV
-UjYW8C1Sk0eMSMM=
+MIIFYjCCA0oCAQIwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
+bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
+CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMjYwM1oXDTIzMDUyNjExMjYw
+M1owaDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
+bGluMRUwEwYDVQQKEwxFeGFtcGxlIEdtYkgxDDAKBgNVBAsMA1ImRDESMBAGA1UE
+AxMJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj0X1
+BD4zndTvh5i+ZI+/PJWNhRQYVh+JMFSc85z/APrqZNbwsOEg2mjyLk+bTUcxSZtA
+JLOBGUp7cwQTLD7VTtW7SEtbrcPdikRFQaTL4MNSZNysCPFTOnaPmkHTqnfrNDq2
+yMoaIDp/73dkefT2hoafy6Of1ZC+Sp8QvVORAsnyauRrSnrQSeQlRLm7i2H8FfXK
+zJm33v7LBoX+xJrpKE0fPvJgTsrUaMH76ytMVvDn+PYrW42lmjnAuWZmPJsCjRX7
+XwPggQ6Sdmzj7Z0XeEX3W2ZAMFP2qhbVVSzS4lOUir7/VwfSHmkfhjR8ElzOw6t+
+wG116OXX+yk0INsP/0pLoo8N7yagyrajYcIO5Il7hxVvG5ToHzwgGEn+rMDr1KrF
+f/4XX55Hx2uw7mzkmpyyUVHCyhkNQUwnEmAXKaRM6TH2k84t3TJD/TapiugOGy+a
+o4cKfqfrRDWg09dk4+l4t+BZdlQ2qs/3Umt1aUGar0CLgRhmQJUvFfYCbTFJH4N8
+TVUE1C1C+anIXlapSZCfe9Nfbj1l8yWZwhhMMKaAjsdcBw1upi+cvPuvNTgu1CUz
+uNuPrYTMVkUxbAvZXE0OClZK8uFhlKD+wPzQOOinH7+xXGpAWoAbs5SckuqD7vIz
+mFA9DcllDRT7eQO5xEdfT1jg/PawS1mY8yp1GysCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAgEAQQJm0wDgnsU4caIYt6LGIvPZtuIUfeCy3ZkM0LJsv3JYj8ppb4ULVknM
+8LNPk3W3BAbnuIZR5E9dkByfu2PF/fNpqJRLpCR5zSN3oQsQjHrf9XAr5VeZ0E/w
+YR/udjTJoXQVm2YhtOhDGJ52TW1TZtNGXrn5kmnkWgqm6WSXIZSQ1viW6a6nklZC
+8Tt0o0l+KiiMapgvC9eNonx3CpM+EzSAASmqUz+uPUG0SIQQfuP0Fs5oYaI/I2F3
+j5WxLBdqjTaatwkrhBV22ZoXigWpTNTHcpc469djr23ie+iHlIO/YkL41DDOI5r9
+EsIKxQBKzO9addeys5gReAiEMhDTYGwflliWhdFMAM1mLB4YJjN1iSJEkWkDGg4G
+N+i/Ydx5fgExAws6tE2nUxTBt/F/6Qe+oWCURLE2YDID+t5z7/JQEFJgnboLsUoe
+epKbITPtzNCnnWRwsqsanlx/RbgtI6Flb6/CWGmzlg1y6XhQDO0D6/4amvjeeqVV
+a3vSVpL06K7/PxDFK8vnJmVcC8SqN5RBwsngMnMpPOjD6TNdXo6R45m7UMjQiFO+
+XLi7SSvngmNsaVOlX3adb77ql6DS4dNLZ0UNi6/fr3ADkdkk6yewNJBgVpFoyNPn
+yZdafIUvaRcrH6QXhRyrDLRhF6j9AJNIqUwDBQ1IhexYz/23r6o=
 -----END CERTIFICATE-----

diff --git a/demo/ssl/tomcat.csr b/demo/ssl/tomcat.csr
index cf5521e5df931c391dcd26c34c90bf2052829828..df66bea181087986b0de2891033712f3bdbe5b6e 100644 (file)
--- a/demo/ssl/tomcat.csr
+++ b/demo/ssl/tomcat.csr
@@ -1,24 +1,24 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIEvDCCAqQCAQAwdzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
-bGluMQ4wDAYDVQQKEwVBcmdlbzETMBEGA1UECxMKQXJnZW8gRGVtbzEhMB8GA1UEAxMYQXJnZW8g
-RGVtbyBUb21jYXQgU2VydmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoF1IzT18
-15UMzdlvMRkCUy/ISfwArbmGAvv5H1LPfPXF+YF6EpjKj74JwHhMGoB1j1BUvem5TeWxszU/mevm
-FCWvrmO83lBAlSNRX6iJm3np3s2/rrtZg2WUu95ZGkRQ1elPRU9KY99rK+NlJH9X6Y6Bfoi5//OA
-yeZ+kIxx39sYXazAYYS9h+8D1mtSHoSFgLMy73gu4UIeon+GW6PbB+E6kQVlRjumBqLtj6a9t59T
-+coc4UStqmFCuPiZuMvbijS0ZBJxuNcaYATcCIjB/S0Pktfyjgxn3HzCLVtPKRskGHHfoxje5QHb
-H5sE5lEQPMFxuuj5C/9eCKs5+8ob06gNVn4u2SB27mLpafqYnJxAhGIqRymZSNwf0Nq7GcUj6OxP
-CzGG1RBV2Add9YpL4rWAeL1ftdNjRmvDwFpbdsY9fO8Oh+sKKsrypQZ0BAHWs+wWVHbgHWHLCv2u
-ky43VRSM3kqBhNcHyc+PWjga+/5M+dqIyi9onoyrZ/dj+KaS5gS5u5dcpjoweb78r67+hJUw02Vz
-ZCXZdZZaadyizTQ8SeGzob47TAgQ15r6PGcSYPhqcEnlu6FoT6IYWh55p1QjAGHmZs3GF93qhwM5
-/9i420gEvqZNegdOTVx+Q2s9VHV7QlMbAKXOaP0degikt5mQPrmmtikAFiwx4/AwGr8CAwEAAaAA
-MA0GCSqGSIb3DQEBBQUAA4ICAQAs7DPJFRFw3drBpZ+cRXVQIybwYHYfKUPZEOGTX+mFgIgp8qfb
-k5IiTZW5JCj3sbskDUfWRcolCpyapUpB2eNej4Fs7Ry1PzwkzIgY1rMlSUnc0oi0JFpYT541RmWP
-o1e1j6+nEbVaRDZ/qk+vgLg/uCpuMwwdXYNOnax9mmCtXKjdIpwKG/WwqtB7ydDS0AszaItvwM5L
-IRAxuM0FteHYc9b5JCS762UpdJcaDTmvBOOShKG7mMSpFFoFlRThE7+kIQYDiV0pUas9odCEAond
-69sOLy9vIdpi6UHB0kEHB5DzEMlkOI5VyuAgsRQXlzxQKyYDS/PZwrR0+aFRq42ErMkmtFrC9kxG
-oDgFRhSHaej34ifM788x1c1oSq/dcy+DwuhaCXgdaTwnMKQVPQo6mHis6WL3DF8jf2EWJMlxvdw3
-0BwNRNSDAS1wN3jO+fJ7amWPa+OmdbYJB68dFNoSDDWW6Se0NJfKm4QBR21ipVlcC2Bk75s3HBRN
-KM8zV7UHQEgZnptatVtUKgiM3qSVbRxHP/miV/rVQpXAhE7z7ixAclx145piueIs0Jqxr4BgQFMd
-Vxeb4brcYk/3nrRrLKgVhVcywMb1V4YYXKuHIKR+cbHEk/lJ35UfEtCOeUKXyLoavbhoA7Ujfeqg
-0jp+vpbTHSFA6BG6ZUhL6FY+oA==
+MIIErTCCApUCAQAwaDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
+bGluMRUwEwYDVQQKEwxFeGFtcGxlIEdtYkgxDDAKBgNVBAsMA1ImRDESMBAGA1UEAxMJbG9jYWxo
+b3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj0X1BD4zndTvh5i+ZI+/PJWNhRQY
+Vh+JMFSc85z/APrqZNbwsOEg2mjyLk+bTUcxSZtAJLOBGUp7cwQTLD7VTtW7SEtbrcPdikRFQaTL
+4MNSZNysCPFTOnaPmkHTqnfrNDq2yMoaIDp/73dkefT2hoafy6Of1ZC+Sp8QvVORAsnyauRrSnrQ
+SeQlRLm7i2H8FfXKzJm33v7LBoX+xJrpKE0fPvJgTsrUaMH76ytMVvDn+PYrW42lmjnAuWZmPJsC
+jRX7XwPggQ6Sdmzj7Z0XeEX3W2ZAMFP2qhbVVSzS4lOUir7/VwfSHmkfhjR8ElzOw6t+wG116OXX
++yk0INsP/0pLoo8N7yagyrajYcIO5Il7hxVvG5ToHzwgGEn+rMDr1KrFf/4XX55Hx2uw7mzkmpyy
+UVHCyhkNQUwnEmAXKaRM6TH2k84t3TJD/TapiugOGy+ao4cKfqfrRDWg09dk4+l4t+BZdlQ2qs/3
+Umt1aUGar0CLgRhmQJUvFfYCbTFJH4N8TVUE1C1C+anIXlapSZCfe9Nfbj1l8yWZwhhMMKaAjsdc
+Bw1upi+cvPuvNTgu1CUzuNuPrYTMVkUxbAvZXE0OClZK8uFhlKD+wPzQOOinH7+xXGpAWoAbs5Sc
+kuqD7vIzmFA9DcllDRT7eQO5xEdfT1jg/PawS1mY8yp1GysCAwEAAaAAMA0GCSqGSIb3DQEBBQUA
+A4ICAQCORSPE6s/ogDnCwX4KDkk8srvdkuERiC3Hb6vTP0bVkLRwHdj77xGNwkXI7UasE52ykOze
+khMuk94onH8yyeDg57EXO4267AsqowV6Od94AGKTndx4Zosx2N+JOGGA0ZwCHvmoX1Wwe1KJ6QoI
+uMdpO+i9uo4ZYth76VV+Yn3mtyJAH0sdHeFkgevKLDURtC+m70XF77NKl+L7VuoNKxXaVCab3d/x
+aksTJpwLGt8QECR1Wq5FPNG/EQiFqQCd3WyzgsebGLDHYQgPEKkKKhMU3G/kIofutz/hNvxp8MRK
+EEEnyfZWiSpYxxmEPmelyinOkoOH5tqbkHzcPawSPFWDBR4pWAg9efdl7zdVAxzNkS5PqWtXrWvm
+jfMAPkTJoeQ6YWZZjHxpYrbBZfIgCr9VehGdzvhDVGbe8NeTDzwk/AItr5shIbFZpA0vIHB4+wEA
+QVl7d1ZM/0qEKGLeHG8TvF4TUIBE1C6RVpnP5jMB9pLQ4FEbgHaadGxQfGxh18GfyxlWmQy8RgDW
+BDJRPClofXm57665hD+py7Jw5F4ZgD5IKwU96kDe7mZRLkF66ZinoubZeyXZBX4N0p7lrWzd/mJj
+r3Yf69L/Ptct7Cr3c4z7Y1xqrBb88bKhVRCfJVtlvE9mSvMh6UUY1QlAGQaDmSQEB+eCO+8diaTa
+gEOeNw==
 -----END NEW CERTIFICATE REQUEST-----

diff --git a/demo/tomcat-server-ssl.xml b/demo/tomcat-server-ssl.xml
deleted file mode 100644 (file)
index 0417b7c..0000000
--- a/demo/tomcat-server-ssl.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Server port="-1" shutdown="SHUTDOWN">
-       <!--APR library loader. Documentation at /docs/apr.html -->
-       <!-- <Listener className="org.apache.catalina.core.AprLifecycleListener" 
-               SSLEngine="on" /> -->
-       <!-- Initialize Jasper prior to webapps are loaded. -->
-       <Listener className="org.apache.catalina.core.JasperListener" />
-       <!-- JMX -->
-       <!-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" 
-               /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" 
-               /> -->
-
-       <Service name="Catalina">
-               <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-                       maxThreads="150" minSpareThreads="4" />
-
-               <!-- HTTP -->
-               <Connector executor="tomcatThreadPool" port="${argeo.server.port.http}"
-                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}"
-                       secure="${argeo.server.http.secure}" proxyName="${argeo.server.http.proxyName}"
-                       proxyPort="${argeo.server.http.proxyPort}" />
-               <!-- HTTPS -->
-               <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
-                       SSLEnabled="true" scheme="https" secure="true" sslProtocol="TLS"
-                       keystoreFile="${argeo.server.keystoreFile}" keystoreType="JKS"
-                       keystorePass="${argeo.server.keystorePass}" truststoreFile="${argeo.server.truststoreFile}"
-                       truststoreType="JKS" truststorePass="${argeo.server.truststorePass}"
-                       clientAuth="${argeo.server.https.clientAuth}" />
-                        
-               <!-- AJP (for proxying with httpd) -->
-               <Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
-                       redirectPort="${argeo.server.port.https}" />
-
-               <Engine name="Catalina" defaultHost="localhost">
-                       <Host name="localhost" appBase="webapps" unpackWARs="true"
-                               autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"
-                               workDir="work">
-                       </Host>
-               </Engine>
-       </Service>
-</Server>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml
index bfecd7f07037a8cf117910d791d0f140b3058444..a9de0ad22ce32edc37e41bb5190621c0c393eb2f 100644 (file)
--- a/server/modules/org.argeo.server.catalina/pom.xml
+++ b/server/modules/org.argeo.server.catalina/pom.xml
@@ -32,6 +32,7 @@
                                                        org.springframework.security.ui;resolution:=optional,
                                                        org.springframework.security.ui.savedrequest;resolution:=optional,
                                                        org.springframework.security.userdetails;resolution:=optional,
+                                                       org.springframework.security.providers.preauth;resolution:=optional,
                                                        org.springframework.web.context.request;resolution:=optional
                                                </Import-Package>
                                        </instructions>