From d1a5528b2f542c1f7004f6f47fba0b083ff03277 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Oct 2016 12:45:47 +0200 Subject: remove MOA-ID specific certStore directory. From now, MOA-ID always use the MOA-SPSS certStore directory for chain building --- .../id/configuration/data/GeneralMOAIDConfig.java | 30 +++++----- .../struts/action/EditGeneralConfigAction.java | 4 +- .../validation/moaconfig/MOAConfigValidator.java | 22 +++---- .../src/main/webapp/jsp/editMOAConfig.jsp | 4 +- .../task/impl/GeneralMOAIDConfigurationTask.java | 37 ++++++------ .../C2556DADDF68A9EEF7F5C14A24CA33BCA930B201 | Bin 1385 -> 0 bytes .../E1201A308CC10323C27D9084B048996E44B8F710 | Bin 806 -> 0 bytes .../D44EED7580C7792242D73E267A89C7DB25E4BD08 | Bin 1314 -> 0 bytes .../7E691392F741B7E4B4AA9A76D75851BDE18BE5A7 | Bin 864 -> 0 bytes .../9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726 | Bin 1383 -> 0 bytes .../08CAE18D8CFF86144CB8FFD671B916CAAB8BD4E9 | Bin 991 -> 0 bytes .../0F843FB1E0C626540BE638B79A2987E2611CE630 | Bin 1018 -> 0 bytes .../69F21C82DC9A7A940ACEC414593E59C9E61E522F | Bin 990 -> 0 bytes .../FC72939DC06EDDF8C51549ECF00AC92BF2B39F35 | Bin 1087 -> 0 bytes .../341F53B3B17518213B1856BFAB3CEFBE948AFC0D | Bin 1070 -> 0 bytes .../3A24040C01D5C9A4980575BFF99A25E534A056CB | Bin 1070 -> 0 bytes .../FB356CEF4406D1F135E3FC59026B338D3F518F9A | Bin 886 -> 0 bytes .../BE9D654B0DE0F3CC53CA36703DD9D9049A5F9330 | Bin 995 -> 0 bytes .../E7340D1FB627D8917A9C0D23F21515C441BF1214 | Bin 1292 -> 0 bytes .../2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D | Bin 820 -> 0 bytes .../386C1663C6390BC288DC171522439210AF361958 | Bin 1000 -> 0 bytes .../9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2 | Bin 1151 -> 0 bytes .../49969819654C230ECDF779ABB9629A211FCC43D6 | Bin 1353 -> 0 bytes .../D0AF386E182F00983637F97C0A5F4708F9F641A7 | Bin 1157 -> 0 bytes .../6814C7316CEA7191C9CB3BE58199B4A957210D9C | Bin 704 -> 0 bytes .../5F06F65C714047E3B282AEC427C35AB703E49D8E | Bin 1169 -> 0 bytes .../D45360060761812D33DE294EAC1573F6DE12A208 | Bin 1169 -> 0 bytes .../C529469053D9F95810A8F7F2DB9A6596A7655732 | Bin 913 -> 0 bytes .../D3C063F219ED073E34AD5D750B327629FFD59AF2 | Bin 979 -> 0 bytes .../1C43C0BA36CC8DE659180B2FAC9A6F54430D5941 | Bin 991 -> 0 bytes .../AC36A78C66FEC87CC0FD2C32B49214C65676E0C5 | Bin 919 -> 0 bytes .../C92238A7178A6C61F8BACA22D6CF7E50772BA9F0 | Bin 1018 -> 0 bytes .../DFAE695342AC81A521025904406884399822B233 | Bin 987 -> 0 bytes .../12B06E039F1A36D8238AFC508009E1ADF88BF66F | Bin 1253 -> 0 bytes .../0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38 | Bin 704 -> 0 bytes .../D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D | Bin 914 -> 0 bytes .../88D6151358A5E3C81D7AE1A536121DC03011BC03 | Bin 1205 -> 0 bytes .../35A40EF932B1F23980E2C672FC939E91EEBD0317 | Bin 1262 -> 0 bytes .../B1D0BC027906A3B7E7518C93ACB26D978233ED27 | Bin 1171 -> 0 bytes .../75F792DE2CF544007F470F1B924961C2BD2EF517 | Bin 802 -> 0 bytes .../08BBE8E906397158FA4BF4058BBBDB5EA11BAE82 | Bin 979 -> 0 bytes .../66AB66128A44574873E54E6584E450C4EB3B9A1E | Bin 1170 -> 0 bytes .../65698A39E03FF00FD552D4AD99FB290C2B9D4BEA | Bin 1018 -> 0 bytes .../04CF0318BA0B54DD76E1DE143445210BDD32E299 | Bin 865 -> 0 bytes .../0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F | Bin 861 -> 0 bytes .../51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE | Bin 865 -> 0 bytes .../9E0512DD61DA5949D1D8631C3F19D75F496C3733 | Bin 864 -> 0 bytes .../E6E6FC88719177C9B7421825757C5E47BCAC85F6 | Bin 860 -> 0 bytes .../C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E | Bin 1298 -> 0 bytes .../A2F138CD16AD04BC3F145E3780BFA169BFDA263B | Bin 1505 -> 0 bytes .../C5AC86EC5B771BEBDF8B6E040F109A1186E229B9 | Bin 1234 -> 0 bytes .../23E594945195F2414803B4D564D2A3A3F5D88B8C | Bin 791 -> 0 bytes .../6F61A0C50B4E6ED821F032A4DF3DA7DDDFD2FE6A | Bin 1256 -> 0 bytes .../65EF37033859C2F709A64086D3A5BD1B8F1A85A4 | Bin 1045 -> 0 bytes .../07298E24461954E4696D2ED9FFB7D52B57F325B3 | Bin 1279 -> 0 bytes .../B630DB0DB940BCE72B2E09868B4CA0A92BBC1D15 | Bin 1273 -> 0 bytes .../3A77E9B577661D99F9BBA5A352B29C7FF58A3D26 | Bin 914 -> 0 bytes .../84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E | Bin 1747 -> 0 bytes .../9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA | Bin 1391 -> 0 bytes .../C23FC1895966021249B35412C0C8C56D107732DE | Bin 1563 -> 0 bytes .../51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4 | Bin 1130 -> 0 bytes .../F5F2456D79490C268569970E900C68FD1C7DC8E5 | Bin 1264 -> 0 bytes .../B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F | Bin 1188 -> 0 bytes .../620127A8E5886A4805403977C3EF7D5EAF881526 | Bin 870 -> 0 bytes .../FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830 | Bin 1141 -> 0 bytes .../4B5B0C2A0BF944CD467A6140F8C782E2BE9D15F9 | Bin 984 -> 0 bytes .../6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B | Bin 1159 -> 0 bytes .../341EA32E448659125A67DD04177FD17468FCFCB1 | Bin 1366 -> 0 bytes .../069519EC949AC6B91D4C33A3F3665441F0220D20 | Bin 1313 -> 0 bytes .../2F5EBA5055E9F7444852ADCEEB769E5DE157A03D | Bin 1352 -> 0 bytes .../334710B9169BCD20687A6302EEB16AEB97F288CD | Bin 825 -> 0 bytes .../D031945D982820B92FADBC7F71F6D1D9DFFDA2C9 | Bin 1213 -> 0 bytes .../CA80A13D41116E24CB1479E970CDC1C030C5907C | Bin 1272 -> 0 bytes .../7A2CFA69FCA284D4627012A7A55662594C803B2A | Bin 901 -> 0 bytes .../ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B | Bin 901 -> 0 bytes .../53CB69CF933C2D28FB9DF91F2852A99EC3352EA0 | Bin 1546 -> 0 bytes .../00845B74CA13FE0A9056E6C0B5126FECF73B0D8C | Bin 740 -> 0 bytes .../474BC41135FB88BF58B5A8D976A1D5583378D85E | Bin 1133 -> 0 bytes .../6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01 | Bin 1171 -> 0 bytes .../FDC348410699803DE7D8276813BC2232EA99A878 | Bin 835 -> 0 bytes .../BF648929E7DAABD8D97B3202F48D6C4A19C78F6C | Bin 990 -> 0 bytes .../FE4F09F5D1A4AADE9232D9E2D6B9A2552BC48A22 | Bin 1147 -> 0 bytes .../6DCD5118D1542E6C205C580775C5420B7509506B | Bin 1076 -> 0 bytes .../3B8484BF1370941BF03F206B5C4958DA4E1559BB | Bin 1065 -> 0 bytes .../6DD653FB8FE2614249924274043E834664EBE980 | Bin 1065 -> 0 bytes .../C0EF3E7A54B4C501295F77974B1995E36B25C92B | Bin 1066 -> 0 bytes .../D29172D3F501A2D7A47F702633044F519A3A5F0B | Bin 1066 -> 0 bytes .../842B3870A64001CDD90978D0E554DAF94D9ABDFE | Bin 947 -> 0 bytes .../679A4F81FC705DDEC419778DD2EBD875F4C242C6 | Bin 975 -> 0 bytes .../82096E6D9B1248321625323D52858642CB0B748E | Bin 975 -> 0 bytes .../53A6B611F8CEE0315BCCE5D59898931ED390E400 | Bin 761 -> 0 bytes .../A149EE01A250491C07D5A279D3B58A646288DA22 | Bin 1185 -> 0 bytes .../AD8ECBB67B9DC59406F92A296A38192297A4F169 | Bin 1191 -> 0 bytes .../45B43346251FDF9E95DCB7F36928785D46D63913 | Bin 1136 -> 0 bytes .../E33619C88426E4FE956041E6751ADDEC9C10F0BC | Bin 1136 -> 0 bytes .../35202B14F69409EAA51CD8AB547AC0CD5E993F3F | Bin 1053 -> 0 bytes .../41E3FCC9470F8634DBCB5CEA7FB688E04E7575BA | Bin 1165 -> 0 bytes .../79B21E2743A879AFF5403ECEA09EAC2084EF4799 | Bin 1014 -> 0 bytes .../3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6 | Bin 1030 -> 0 bytes .../9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B | Bin 932 -> 0 bytes .../A562C4B99E2847251CB4A1F05DA1FF43E7296F0B | Bin 999 -> 0 bytes .../9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C | Bin 997 -> 0 bytes .../9F0E0FBB25F66FF88C8E033EFF358923C84A2926 | Bin 930 -> 0 bytes .../C87D1855227D995C332C4C9072A2E2053F2CC623 | Bin 1028 -> 0 bytes .../42AD1897A4643D2AA634D980F16349E6694F3B1B | Bin 1237 -> 0 bytes .../FE7891B6ED7B178F528A28B21478299F865889BD | Bin 1333 -> 0 bytes .../3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B | Bin 1201 -> 0 bytes .../8784ED81F5A22779EB0B081945FD151992557FBE | Bin 1159 -> 0 bytes .../88583DB03975127CB488CA7DDE303A1646CEA97B | Bin 1159 -> 0 bytes .../0C30A6F2950EFEFBAB5964DA9E0EED7C9DB115D8 | Bin 1058 -> 0 bytes .../20CAECDCA766243AAD6FA1327618FC81BA65DC0F | Bin 1057 -> 0 bytes .../96D5D179016A5A6546973BA63733617EE1F1540D | Bin 1058 -> 0 bytes .../CF236CF66379EA506F967D21F0E25E87529D9687 | Bin 1058 -> 0 bytes .../FDD40A10FB9BE9DEB5B8AE76CC0184930EF8BB76 | Bin 1057 -> 0 bytes .../266FCA0265A576548425BDAE15448665EE8BB889 | Bin 1076 -> 0 bytes .../D4D1370FD1D9EAA46412008FF3E59E114BCF724A | Bin 1111 -> 0 bytes .../DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A | Bin 1110 -> 0 bytes .../E619D25B380B7B13FDA33E8A58CD82D8A88E0515 | Bin 1111 -> 0 bytes .../F825578F8F5484DFB40F81867C392D6CB0012B92 | Bin 1110 -> 0 bytes .../A9D28607928FA8615E2615CC9D71B535C5D0D419 | Bin 734 -> 0 bytes .../4D523730501ADB80A76B0B473A4D21C7D86F8374 | Bin 1167 -> 0 bytes .../7AC3EFA52DE27A930EC8754DB5E061476948E914 | Bin 1028 -> 0 bytes .../8944AF64790FA467C02424CB22523A068C3B72DB | Bin 1073 -> 0 bytes .../36B41A8B411985ED1032DBD85A154207164A9B85 | Bin 1069 -> 0 bytes .../AA94FD422AEB8F5B6E8508314CE0DC68BCD53305 | Bin 1339 -> 0 bytes .../07A6DEED70213CCF598F278789680DA4C04A0331 | Bin 1266 -> 0 bytes .../A5A00B223EF24AED92D03F652CFE367CA9D1B200 | Bin 958 -> 0 bytes .../BD78039E45BA4E4B13ADECC58124520ACE83B6A7 | Bin 1614 -> 0 bytes .../7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2 | Bin 920 -> 0 bytes .../D1474E7D99512D05B98DD37B3FE86496A03D088D | Bin 922 -> 0 bytes .../9766A5ED03482991DA91BB763ECDCD9417394100 | Bin 1169 -> 0 bytes .../BB97947C31BBF3364A2909F9876DBD3B87B5B62A | Bin 1169 -> 0 bytes .../60B7181FD8BCA00B84961BF31DB08C50376CCF44 | Bin 1068 -> 0 bytes .../74801529B4E8E5764FFC4D8E6577E1F84E8101CE | Bin 1067 -> 0 bytes .../7B7B60B748C82B34EE71A3CEA729C477083F0BDA | Bin 1068 -> 0 bytes .../EBB80BE34C78814AE659BBA3A2394E4D9857123D | Bin 1068 -> 0 bytes .../7BE0C8E441786C69A3CB35BDBEF235F8B5310E04 | Bin 700 -> 0 bytes .../42EFDDE6BFF35ED0BAE6ACDD204C50AE86C4F4FA | Bin 975 -> 0 bytes .../51C01567BCB22968EF5A297B7EA84E195594E0E8 | Bin 975 -> 0 bytes .../DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE | Bin 823 -> 0 bytes .../844FDEEE3C847F4BD5153E822803C1A2C1B6E7BA | Bin 1159 -> 0 bytes .../B38C775A18C1195D01658D75FBDA3258B6DF018B | Bin 1159 -> 0 bytes .../6955D95F6B0799F7D96F4FC28E6E6C64758C1240 | Bin 1224 -> 0 bytes .../F96FE4F59166EFA9000B21A16EF22CF14468890C | Bin 944 -> 0 bytes .../7D0C7B977ACEA63D51EE34B00BC3C1DBF318B92E | Bin 1159 -> 0 bytes .../A79681CBDD69EC741214136F128923A574E26F03 | Bin 1159 -> 0 bytes .../C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED | Bin 406 -> 0 bytes .../7666A8BD2C2513DE489C06D08D566F177ECE84AA | Bin 1260 -> 0 bytes .../02A0E6456442E35198532ACFFB6FEE3B606D9FA3 | Bin 1366 -> 0 bytes .../7D60E314AA6AEF548A614A9354C5068192051A29 | Bin 2278 -> 0 bytes .../C6658C25AFB8A9D738F2BC591775D167549FFD3A | Bin 1264 -> 0 bytes .../8AB0A3519AFA7F3C04074522678BAA1CB3DC734F | Bin 930 -> 0 bytes .../DF47B3040E7632614464BD2EC4ECD1B8030F53E3 | Bin 933 -> 0 bytes .../E117479B4A41D7F3223FCAE50560B0D57B22217D | Bin 997 -> 0 bytes .../07976A2A16EC182670161B46886B05E1FEAC16B1 | Bin 1209 -> 0 bytes .../52ED0FAFBD38A868C678174D7EB03D266ADB221C | Bin 994 -> 0 bytes .../8BA5C0847597612C7E16970EAE55EF58D32E9CF3 | Bin 1202 -> 0 bytes .../18585FC53A283488E4BA84867980E9B1F2B28ADA | Bin 1313 -> 0 bytes .../27337257493B86B9BFF78D569F938D692A430EAE | Bin 1218 -> 0 bytes .../4832F0A28C3724A92F6CB3314F747D0E74FC7344 | Bin 1217 -> 0 bytes .../6352302A5072DBFB769D4FF4C70C86432C4C1683 | Bin 1218 -> 0 bytes .../EE886B907E31667D622677F665F25C54AF9A7F65 | Bin 1218 -> 0 bytes .../698563ECEE29232C5304487D972310F86650C3A6 | Bin 1185 -> 0 bytes .../B4B77C83465979E3679E3A33F972F48EE3730A18 | Bin 924 -> 0 bytes .../3AAD23B00CA10E54E6368DF7952E3F4B5108B65C | Bin 606 -> 0 bytes .../14E59C02A6877B0EBD2C4203886BA25959C1D267 | Bin 1020 -> 0 bytes .../ED5608CE67EA5CB79AC024CEA7445F9BCBE48703 | Bin 1067 -> 0 bytes .../F3AE9FEA4DECEE5330770A2520BD86909929E7BE | Bin 758 -> 0 bytes .../16D8270DE51B034E77B7CDAF1DEE623916243DDC | Bin 1068 -> 0 bytes .../3D3F25C5CD9F932037D91B7D102EDB58EC7C8239 | Bin 1068 -> 0 bytes .../40B51EEF4E709FBD47935DDD83A1F640D0CC378A | Bin 1067 -> 0 bytes .../D4E1786D8B8B57B22C81D0F0FCE18EA818DA0537 | Bin 1068 -> 0 bytes .../CAF84A42305615AC2C582F6412BDA3E36DAC3D25 | Bin 786 -> 0 bytes .../D7EDAF7381F7FC93B4C28FA372190D7A59CFA696 | Bin 660 -> 0 bytes .../EC988340526163D5B7AC80481B2AC76828EDDC6C | Bin 1157 -> 0 bytes ...0240701.SerNo144ddd(SecureSignatureKeypair).cer | 26 -------- ...0240701.SerNo144de4(SecureSignatureKeypair).cer | 23 ------- ...0240701.SerNo144df5(SecureSignatureKeypair).cer | 23 ------- ...-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer | Bin 1485 -> 0 bytes ...0701-20240701.SerNo144dc3(CertifiedKeypair).cer | 21 ------- ...rust-nQual-03-20140723-20250723.SerNo14b4f9.cer | 23 ------- .../DigiCert High Assurance EV Root CA.crt | 23 ------- ...e CA 3 (DigiCert High Assurance EV Root CA).crt | 29 --------- ...Premium-Enc-05.20130923-20230920.SerNoFCDEE.cer | Bin 1580 -> 0 bytes ...Premium-Sig-05.20130923-20230920.SerNoFCDB8.cer | Bin 1580 -> 0 bytes ...Test-Sig-02.20141124-20241118.SerNo3969edc1.cer | Bin 1029 -> 0 bytes ...remium-enc-02.20140701-20240701.SerNo144dfd.cer | Bin 1159 -> 0 bytes ...a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer | 26 -------- ...-Test-Qual-01.20141117-20241111.SerNo16120f.cer | 23 ------- ...rate-light-02.20140905-20240905.SerNo153B49.cer | Bin 1167 -> 0 bytes ...remium-sig-02.20140701-20240701.SerNo144e10.cer | Bin 1159 -> 0 bytes ...remium-sig-03.20140701-20240701.SerNo144e13.cer | Bin 1159 -> 0 bytes .../toBeAdded/atrust_OCSP_Responder_03-1.crt | Bin 1185 -> 0 bytes id/server/doc/handbook/config/config.html | 7 +-- .../moa/id/config/ConfigurationProviderImpl.java | 14 ----- .../PropertyBasedAuthConfigurationProvider.java | 26 -------- .../pvp2x/metadata/SimpleMOAMetadataProvider.java | 1 - .../protocols/pvp2x/utils/MOASAMLSOAPClient.java | 3 +- .../at/gv/egovernment/moa/id/util/SSLUtils.java | 4 +- .../moa/id/commons/api/ConfigurationProvider.java | 2 - .../utils/MOAHttpProtocolSocketFactory.java | 35 +++++++++-- .../id/commons/utils/ssl/MOAIDTrustManager.java | 66 ++++++++++----------- .../moa/id/commons/utils/ssl/PKIProfileImpl.java | 29 +++++++-- .../moa/id/commons/utils/ssl/SSLUtils.java | 16 +++-- .../engine/MOAeIDASChainingMetadataProvider.java | 1 - 205 files changed, 146 insertions(+), 372 deletions(-) delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/01540E2704537AA810D671E1C4106FD8821EB52A/C2556DADDF68A9EEF7F5C14A24CA33BCA930B201 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0A5C2C9276B649D088A86BD9FD97E2B95658481D/08CAE18D8CFF86144CB8FFD671B916CAAB8BD4E9 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0BF5B0C4B029051D91A83EE9CCD0266A52D867A6/341F53B3B17518213B1856BFAB3CEFBE948AFC0D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0BF5B0C4B029051D91A83EE9CCD0266A52D867A6/3A24040C01D5C9A4980575BFF99A25E534A056CB delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/10D143E18C03A4A29F783D26F2F67E3B64C35CB0/BE9D654B0DE0F3CC53CA36703DD9D9049A5F9330 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/15A052B0DC4E0333656264E2FEEBE45B1BE449BF/386C1663C6390BC288DC171522439210AF361958 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/20EF2EC4E04DF4D51A8F10DFE4249C0024C7A28C/5F06F65C714047E3B282AEC427C35AB703E49D8E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/20EF2EC4E04DF4D51A8F10DFE4249C0024C7A28C/D45360060761812D33DE294EAC1573F6DE12A208 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/328AA897B7E6270202B2FC0889FF88D66BB41122/35A40EF932B1F23980E2C672FC939E91EEBD0317 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/349CA7B279F4EF3C085B1E8D08AA5DE3EC586188/08BBE8E906397158FA4BF4058BBBDB5EA11BAE82 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3868959083AA986194E58E73798BCD724D785A0E/66AB66128A44574873E54E6584E450C4EB3B9A1E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/04CF0318BA0B54DD76E1DE143445210BDD32E299 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3C025917C3C938FEB856E5440D28E4A568C311DC/A2F138CD16AD04BC3F145E3780BFA169BFDA263B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/405D86C9D39B1061885678ED90780A0F04A76327/6F61A0C50B4E6ED821F032A4DF3DA7DDDFD2FE6A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/427765A998398EE1B138ABDBA20313DC4A3738A0/07298E24461954E4696D2ED9FFB7D52B57F325B3 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/427765A998398EE1B138ABDBA20313DC4A3738A0/B630DB0DB940BCE72B2E09868B4CA0A92BBC1D15 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/4C7CAA9FE9C08078541DA31B76FF0951E73480FF/C23FC1895966021249B35412C0C8C56D107732DE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/53CF955B19387A437659158BC050B7BC4B238132/F5F2456D79490C268569970E900C68FD1C7DC8E5 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/5650A465FD3B5EF83639E11F324A2A0EA98AF935/4B5B0C2A0BF944CD467A6140F8C782E2BE9D15F9 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/5E043AA9A832C33C7065B7633F4C007E0394BA19/069519EC949AC6B91D4C33A3F3665441F0220D20 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/5E043AA9A832C33C7065B7633F4C007E0394BA19/2F5EBA5055E9F7444852ADCEEB769E5DE157A03D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/68AF646E90A6FF370230F64ACD4E8A4F12C03916/CA80A13D41116E24CB1479E970CDC1C030C5907C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/7A2CFA69FCA284D4627012A7A55662594C803B2A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/88BBA52A5AF119284F03A7D0D1DA61934EE57A79/FE4F09F5D1A4AADE9232D9E2D6B9A2552BC48A22 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/6DD653FB8FE2614249924274043E834664EBE980 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/D29172D3F501A2D7A47F702633044F519A3A5F0B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/82096E6D9B1248321625323D52858642CB0B748E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/92E5C38466AECA677325C25C3C3011C97D24CCF6/A149EE01A250491C07D5A279D3B58A646288DA22 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/92E5C38466AECA677325C25C3C3011C97D24CCF6/AD8ECBB67B9DC59406F92A296A38192297A4F169 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9C5C7CD895AABBFF23E79907A97FB2D68423CA8E/41E3FCC9470F8634DBCB5CEA7FB688E04E7575BA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9C5C7CD895AABBFF23E79907A97FB2D68423CA8E/79B21E2743A879AFF5403ECEA09EAC2084EF4799 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/88583DB03975127CB488CA7DDE303A1646CEA97B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/0C30A6F2950EFEFBAB5964DA9E0EED7C9DB115D8 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/CF236CF66379EA506F967D21F0E25E87529D9687 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/FDD40A10FB9BE9DEB5B8AE76CC0184930EF8BB76 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A7437C35301BDB5349F320B62231615028F397F8/266FCA0265A576548425BDAE15448665EE8BB889 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/D4D1370FD1D9EAA46412008FF3E59E114BCF724A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/AF03510E8BCAE72BB7C4E9D1910B4E12057075A4/7AC3EFA52DE27A930EC8754DB5E061476948E914 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/B1A1ACC805C656EF257C5115509B977964591D7E/8944AF64790FA467C02424CB22523A068C3B72DB delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/B293710691F553804016FCEC3428ABA1CB11ADF7/36B41A8B411985ED1032DBD85A154207164A9B85 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/B749506C821467F7D6F4E8943D07DDED771A7B47/A5A00B223EF24AED92D03F652CFE367CA9D1B200 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/B9041947DCD9B7E2B82D72D6A0FF1FBC4B213DC0/BD78039E45BA4E4B13ADECC58124520ACE83B6A7 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BE77EF0A6C18C4B70D3B516426B559A2C1969460/9766A5ED03482991DA91BB763ECDCD9417394100 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BE77EF0A6C18C4B70D3B516426B559A2C1969460/BB97947C31BBF3364A2909F9876DBD3B87B5B62A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BEBA5B735BCC34BDB0D778DAA1E669AEF999FCAB/60B7181FD8BCA00B84961BF31DB08C50376CCF44 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BEBA5B735BCC34BDB0D778DAA1E669AEF999FCAB/74801529B4E8E5764FFC4D8E6577E1F84E8101CE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BEBA5B735BCC34BDB0D778DAA1E669AEF999FCAB/7B7B60B748C82B34EE71A3CEA729C477083F0BDA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BEBA5B735BCC34BDB0D778DAA1E669AEF999FCAB/EBB80BE34C78814AE659BBA3A2394E4D9857123D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BF375B55D8D7CFC31FD8E3FBF7B1981A91A1A6CA/42EFDDE6BFF35ED0BAE6ACDD204C50AE86C4F4FA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/BF375B55D8D7CFC31FD8E3FBF7B1981A91A1A6CA/51C01567BCB22968EF5A297B7EA84E195594E0E8 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C20C15B6163E675959D273D502F0D80718326C55/844FDEEE3C847F4BD5153E822803C1A2C1B6E7BA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C20C15B6163E675959D273D502F0D80718326C55/B38C775A18C1195D01658D75FBDA3258B6DF018B delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C6673943153C8BE9F977A89A00ED84B432074576/7D0C7B977ACEA63D51EE34B00BC3C1DBF318B92E delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C6673943153C8BE9F977A89A00ED84B432074576/A79681CBDD69EC741214136F128923A574E26F03 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/CC93161E57C3898635E1D086008BD053F542457F/7D60E314AA6AEF548A614A9354C5068192051A29 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/CD2D87A57D1568A515128BE9DA8B3CAE7AC007A4/C6658C25AFB8A9D738F2BC591775D167549FFD3A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/18585FC53A283488E4BA84867980E9B1F2B28ADA delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/6352302A5072DBFB769D4FF4C70C86432C4C1683 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/EE886B907E31667D622677F665F25C54AF9A7F65 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/E47BA33321A8A919414A123C91F5D253766AB078/698563ECEE29232C5304487D972310F86650C3A6 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F4834A83B4ED558A1E349821898B6DE4353516F1/16D8270DE51B034E77B7CDAF1DEE623916243DDC delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F4834A83B4ED558A1E349821898B6DE4353516F1/3D3F25C5CD9F932037D91B7D102EDB58EC7C8239 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F4834A83B4ED558A1E349821898B6DE4353516F1/40B51EEF4E709FBD47935DDD83A1F640D0CC378A delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F4834A83B4ED558A1E349821898B6DE4353516F1/D4E1786D8B8B57B22C81D0F0FCE18EA818DA0537 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696 delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/DigiCert High Assurance EV Root CA.crt delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/TERENA SSL High Assurance CA 3 (DigiCert High Assurance EV Root CA).crt delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-Premium-Enc-05.20130923-20230920.SerNoFCDEE.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-Premium-Sig-05.20130923-20230920.SerNoFCDB8.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer delete mode 100644 id/server/data/deploy/conf/moa-id/certs/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java index 86ac6f779..82eb5592a 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java @@ -69,7 +69,7 @@ public class GeneralMOAIDConfig { public static final String LINE_DELIMITER = ";"; private String alternativeSourceID = null; - private String certStoreDirectory = null; +// private String certStoreDirectory = null; private boolean trustmanagerrevocationcheck = true; private String timeoutAssertion = String.valueOf(DEFAULTTIMEOUTASSERTION); @@ -217,7 +217,7 @@ public class GeneralMOAIDConfig { GeneralConfiguration authgen = auth.getGeneralConfiguration(); if (authgen != null) { alternativeSourceID = authgen.getAlternativeSourceID(); - certStoreDirectory = authgen.getCertStoreDirectory(); + //certStoreDirectory = authgen.getCertStoreDirectory(); if (authgen.isTrustManagerRevocationChecking() != null) trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking(); @@ -449,19 +449,19 @@ public class GeneralMOAIDConfig { this.szrgwURL = szrgwURL; } - /** - * @return the certStoreDirectory - */ - public String getCertStoreDirectory() { - return certStoreDirectory; - } - - /** - * @param certStoreDirectory the certStoreDirectory to set - */ - public void setCertStoreDirectory(String certStoreDirectory) { - this.certStoreDirectory = certStoreDirectory; - } +// /** +// * @return the certStoreDirectory +// */ +// public String getCertStoreDirectory() { +// return certStoreDirectory; +// } +// +// /** +// * @param certStoreDirectory the certStoreDirectory to set +// */ +// public void setCertStoreDirectory(String certStoreDirectory) { +// this.certStoreDirectory = certStoreDirectory; +// } /** * @return the timeoutAssertion diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index 74a19dd0b..cf5911b3a 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -287,8 +287,8 @@ public class EditGeneralConfigAction extends BasicAction { // dbauthgeneral.setAlternativeSourceID(oldauthgeneral.getAlternativeSourceID()); // } - if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory())) - dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory()); +// if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory())) +// dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory()); TimeOuts dbtimeouts = dbauthgeneral.getTimeOuts(); if (dbtimeouts == null) { diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java index cb546c5a8..70c43d9b4 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java @@ -113,17 +113,17 @@ public class MOAConfigValidator { } } - check = form.getCertStoreDirectory(); - if (MiscUtil.isNotEmpty(check)) { - if (ValidationHelper.isValidOAIdentifier(check)) { - log.warn("CertStoreDirectory contains potentail XSS characters: " + check); - errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", - new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request )); - } - } else { - log.info("CertStoreDirectory is empty."); - errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request)); - } +// check = form.getCertStoreDirectory(); +// if (MiscUtil.isNotEmpty(check)) { +// if (ValidationHelper.isValidOAIdentifier(check)) { +// log.warn("CertStoreDirectory contains potentail XSS characters: " + check); +// errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", +// new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request )); +// } +// } else { +// log.info("CertStoreDirectory is empty."); +// errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request)); +// } check = form.getDefaultBKUHandy(); if (MiscUtil.isNotEmpty(check)) { diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index 446b2e110..6694a4273 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -123,12 +123,12 @@

<%=LanguageHelper.getGUIString("webpages.moaconfig.certificates.header", request) %>

- - + --%> Beispielwert Beschreibung - - CertStoreDirecorty - certs/certstore - Gibt den Pfadnamen zu einem Verzeichnis an, das als Zertifikatsspeicher im Zuge der TLS-Server-Zertifikatsüberprüfung verwendet wird. -

TrustManagerRevocation

-Checking + Checking   Für die TLS-Server-Authentisierung dürfen nur Server-Zertifikate verwendet werden, die eine CRLDP-Extension enthalten (andernfalls kann von MOA-ID-Auth keine CRL-überprüfung durchgeführt werden). Soll das RevocationChecking generell ausgeschaltet werden, ist dieses Attribut anzugeben und auf "false" zu setzen diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java index 0c4dd2097..2b5459208 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java @@ -53,7 +53,6 @@ import java.util.Properties; import at.gv.egovernment.moa.id.commons.api.ConfigurationProvider; import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException; import at.gv.egovernment.moa.id.commons.config.SpringProfileConstants; -import at.gv.egovernment.moa.id.data.IssuerAndSerial; import at.gv.egovernment.moa.id.protocols.pvp2x.config.MOADefaultBootstrap; import at.gv.egovernment.moa.logging.Logger; import at.gv.util.config.EgovUtilPropertiesConfiguration; @@ -115,25 +114,12 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider /** The default chaining mode. */ protected String defaultChainingMode = "pkix"; - /** - * A Map which contains the IssuerAndSerial to - * chaining mode (a String) mapping. - */ - protected Map chainingModes; - - /** - * the URL for the trusted CA Certificates - */ - protected String trustedCACertificates; - /** * main configuration file directory name used to configure MOA-ID */ protected String rootConfigFileDir; - protected String certstoreDirectory; - protected boolean trustmanagerrevoationchecking = true; protected Properties configProp = null; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java index 94353fb6b..8e98c5129 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java @@ -1078,32 +1078,6 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide } } - /** - * Returns the path to the certificate-store directory or {@code null} if there is no certificate-store directory defined. - * - * @return the path to the certstore directory or {@code null} - */ - @Override - @Transactional - public String getCertstoreDirectory() { - try { - String path = rootConfigFileDir + configuration.getStringValue( - MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL); - if (MiscUtil.isNotEmpty(path)) - return path; - - else { - Logger.warn("Error in MOA-ID Configuration. No CertStoreDirectory defined."); - return null; - - } - - } catch (at.gv.egiz.components.configuration.api.ConfigurationException e) { - Logger.warn("Error in MOA-ID Configuration. No CertStoreDirectory defined.", e); - return null; - } - } - @Override @Transactional public String getTrustedCACertificates() { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/SimpleMOAMetadataProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/SimpleMOAMetadataProvider.java index 7a2acee9c..c0ba1d96d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/SimpleMOAMetadataProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/SimpleMOAMetadataProvider.java @@ -68,7 +68,6 @@ public abstract class SimpleMOAMetadataProvider implements MetadataProvider{ try { MOAHttpProtocolSocketFactory protoSocketFactory = new MOAHttpProtocolSocketFactory( PVPConstants.SSLSOCKETFACTORYNAME, - AuthConfigurationProviderFactory.getInstance().getCertstoreDirectory(), AuthConfigurationProviderFactory.getInstance().getTrustedCACertificates(), null, AuthConfiguration.DEFAULT_X509_CHAININGMODE, diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/MOASAMLSOAPClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/MOASAMLSOAPClient.java index d5ab4b2e7..0d1f54249 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/MOASAMLSOAPClient.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/MOASAMLSOAPClient.java @@ -72,8 +72,7 @@ public class MOASAMLSOAPClient { try { SecureProtocolSocketFactory sslprotocolsocketfactory = new MOAHttpProtocolSocketFactory( - PVPConstants.SSLSOCKETFACTORYNAME, - AuthConfigurationProviderFactory.getInstance().getCertstoreDirectory(), + PVPConstants.SSLSOCKETFACTORYNAME, AuthConfigurationProviderFactory.getInstance().getTrustedCACertificates(), null, AuthConfigurationProviderFactory.getInstance().getDefaultChainingMode(), diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java index 784581648..cd700c74a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java @@ -124,8 +124,8 @@ public class SSLUtils { try { SSLSocketFactory ssf = at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils.getSSLSocketFactory( - connParam.getUrl(), - conf.getCertstoreDirectory(), + connParam.getUrl(), + null, trustStoreURL, acceptedServerCertURL, AuthConfigurationProviderFactory.getInstance().getDefaultChainingMode(), diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java index cbbca12c5..e14f9c9ce 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java @@ -60,8 +60,6 @@ public interface ConfigurationProvider { public String getTrustedCACertificates(); - public String getCertstoreDirectory(); - public boolean isTrustmanagerrevoationchecking(); /** diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java index 3b1f0c7b5..4f3f921df 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java @@ -50,19 +50,42 @@ public class MOAHttpProtocolSocketFactory implements SecureProtocolSocketFactory public MOAHttpProtocolSocketFactory ( String url, - String certStoreRootDirParam, String trustStoreURL, String acceptedServerCertURL, String chainingMode, boolean checkRevocation, - String[] revocationMethodOrder - ) throws MOAHttpProtocolSocketFactoryException { - super(); + String[] revocationMethodOrder) throws MOAHttpProtocolSocketFactoryException { + internalInitialize(url, null, trustStoreURL, acceptedServerCertURL, chainingMode, checkRevocation, revocationMethodOrder); + } + + /** + * @param string + * @param certStoreDirectory + * @param trustStoreDirectory + * @param object + * @param string2 + * @param b + * @param strings + */ + public MOAHttpProtocolSocketFactory(String url, String certStoreDirectory, String trustStoreURL, + String acceptedServerCertURL, + String chainingMode, + boolean checkRevocation, + String[] revocationMethodOrder) throws MOAHttpProtocolSocketFactoryException { + internalInitialize(url, certStoreDirectory, trustStoreURL, acceptedServerCertURL, chainingMode, checkRevocation, revocationMethodOrder); + + } + + private void internalInitialize(String url, String certStoreDirectory, String trustStoreURL, + String acceptedServerCertURL, + String chainingMode, + boolean checkRevocation, + String[] revocationMethodOrder) throws MOAHttpProtocolSocketFactoryException { try { this.sslfactory = at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils.getSSLSocketFactory( url, - certStoreRootDirParam, + certStoreDirectory, trustStoreURL, acceptedServerCertURL, chainingMode, @@ -85,7 +108,7 @@ public class MOAHttpProtocolSocketFactory implements SecureProtocolSocketFactory throw new MOAHttpProtocolSocketFactoryException("Initialize SSL Context FAILED", e); } - + } /* (non-Javadoc) diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java index 969de3ce6..9fc6f799d 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java @@ -59,12 +59,6 @@ import java.util.List; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moaspss.logging.LoggingContext; import at.gv.egovernment.moaspss.logging.LoggingContextManager; -import iaik.logging.TransactionId; -import iaik.logging.impl.TransactionIdImpl; -import iaik.pki.PKIConfiguration; -import iaik.pki.PKIException; -import iaik.pki.PKIFactory; -import iaik.pki.PKIProfile; import iaik.pki.jsse.IAIKX509TrustManager; @@ -168,35 +162,35 @@ public class MOAIDTrustManager extends IAIKX509TrustManager { return true; } - public void init(PKIConfiguration pkiConfig, PKIProfile pkiProfile) throws PKIException { - if (pkiProfile == null) { - throw new NullPointerException("pkiConfig parameter must not be null"); - - } - - TransactionId tid = new TransactionIdImpl("Init"); - log_.info(tid, "Setting up IAIKX509TrustManager", null); - if (pkiConfig != null) { - PKIFactory.getInstance().configure(pkiConfig, tid); -// log_.info(tid, "Registering LDAP protocol handler", null); -// String protocolHandlers = -// System.getProperty("java.protocol.handler.pkgs"); -// if (protocolHandlers == null) { -// protocolHandlers = "iaik.pki"; -// -// } else { -// protocolHandlers = protocolHandlers + "|iaik.pki"; -// -// } -// -// System.setProperty("java.protocol.handler.pkgs", protocolHandlers); -// log_.info(tid, "Registered protocol handlers: " + protocolHandlers, null); - - } - - pkiProfile_ = pkiProfile; - pkiFactory_ = PKIFactory.getInstance(); - initialized_ = true; - } +// public void init(PKIConfiguration pkiConfig, PKIProfile pkiProfile) throws PKIException { +// if (pkiProfile == null) { +// throw new NullPointerException("pkiConfig parameter must not be null"); +// +// } +// +// TransactionId tid = new TransactionIdImpl("Init"); +// log_.info(tid, "Setting up IAIKX509TrustManager", null); +// if (pkiConfig != null) { +// PKIFactory.getInstance().configure(pkiConfig, tid); +//// log_.info(tid, "Registering LDAP protocol handler", null); +//// String protocolHandlers = +//// System.getProperty("java.protocol.handler.pkgs"); +//// if (protocolHandlers == null) { +//// protocolHandlers = "iaik.pki"; +//// +//// } else { +//// protocolHandlers = protocolHandlers + "|iaik.pki"; +//// +//// } +//// +//// System.setProperty("java.protocol.handler.pkgs", protocolHandlers); +//// log_.info(tid, "Registered protocol handlers: " + protocolHandlers, null); +// +// } +// +// pkiProfile_ = pkiProfile; +// pkiFactory_ = PKIFactory.getInstance(); +// initialized_ = true; +// } } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java index 9b692c090..1c8b6e18d 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java @@ -46,10 +46,12 @@ package at.gv.egovernment.moa.id.commons.utils.ssl; +import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; import java.util.Collections; import java.util.Set; +import iaik.asn1.structures.AlgorithmID; import iaik.pki.PKIProfile; import iaik.pki.pathvalidation.ValidationProfile; import iaik.pki.revocation.RevocationProfile; @@ -66,7 +68,7 @@ import iaik.pki.store.truststore.TrustStoreTypes; */ public class PKIProfileImpl extends ObservableImpl implements PKIProfile, RevocationProfile, TrustStoreProfile, ValidationProfile { - + /** * URI to the truststore */ @@ -79,6 +81,7 @@ public class PKIProfileImpl extends ObservableImpl private String[] revocationCheckMethode = new String[] {RevocationSourceTypes.CRL}; + protected String ocspRequestHashAlgorithm_ = null; /** * The trust profile identifier. @@ -130,16 +133,32 @@ public class PKIProfileImpl extends ObservableImpl * @see iaik.pki.revocation.RevocationProfile#getMaxRevocationAge(java.lang.String) */ public long getMaxRevocationAge(String arg0) { - return 0; + return 0L; } /** * @see iaik.pki.revocation.RevocationProfile#getOCSPRequestHashAlgorithm() */ public String getOCSPRequestHashAlgorithm() { - return null; + if (ocspRequestHashAlgorithm_ == null) { + try + { + ocspRequestHashAlgorithm_ = AlgorithmID.sha1.getImplementationName(); + } + catch (NoSuchAlgorithmException localNoSuchAlgorithmException) {} + } + return ocspRequestHashAlgorithm_; } + public void setOCSPRequestHashAlgorithm(AlgorithmID paramAlgorithmID) + throws NoSuchAlgorithmException + { + if (paramAlgorithmID == null) { + throw new NullPointerException("Algorithm must not be null."); + } + ocspRequestHashAlgorithm_ = paramAlgorithmID.getImplementationName(); + } + /** * @see iaik.pki.revocation.RevocationProfile#getPreferredServiceOrder(java.security.cert.X509Certificate) */ @@ -233,8 +252,8 @@ public class PKIProfileImpl extends ObservableImpl */ @Override public int autoAddCertificates() { - //TODO: ask harald!!!!! return 1; + } /* (non-Javadoc) @@ -242,7 +261,7 @@ public int autoAddCertificates() { */ @Override public TrustStoreProfile getIndirectRevocationTrustStoreProfile() { - //TODO: ask harald!!!!! return null; + } } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java index d2a099c69..4ecda435d 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java @@ -61,7 +61,7 @@ import javax.net.ssl.TrustManager; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.KeyStoreUtils; -import iaik.pki.PKIConfiguration; +import iaik.pki.DefaultPKIConfiguration; import iaik.pki.PKIException; import iaik.pki.PKIFactory; //import iaik.pki.jsse.IAIKX509TrustManager; @@ -218,12 +218,16 @@ public class SSLUtils { boolean checkRevocation, String[] revocationMethodOrder) throws SSLConfigurationException, PKIException, IOException, GeneralSecurityException { - PKIConfiguration cfg = null; - if (! PKIFactory.getInstance().isAlreadyConfigured()) - cfg = new PKIConfigurationImpl(certStoreRootDirParam, chainingMode); - - PKIProfileImpl profile = new PKIProfileImpl(trustStoreURL, checkRevocation); + DefaultPKIConfiguration cfg = null; + if (! PKIFactory.getInstance().isAlreadyConfigured()) { + CertStoreConfigurationImpl certStoreConf = new CertStoreConfigurationImpl(certStoreRootDirParam); + cfg = new DefaultPKIConfiguration(certStoreConf.getParameters()); + cfg.setChainingMode(chainingMode); + Logger.info("Set-up PKI module configuration ... "); + + } + PKIProfileImpl profile = new PKIProfileImpl(trustStoreURL, checkRevocation); profile.setPreferredServiceOrder(revocationMethodOrder); // This call fixes a bug occuring when PKIConfiguration is diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java index cb1fe36c8..0cb6228a7 100644 --- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java +++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java @@ -206,7 +206,6 @@ public class MOAeIDASChainingMetadataProvider implements ObservableMetadataProvi try { MOAHttpProtocolSocketFactory protoSocketFactory = new MOAHttpProtocolSocketFactory( Constants.SSLSOCKETFACTORYNAME, - authConfig.getCertstoreDirectory(), authConfig.getTrustedCACertificates(), null, AuthConfiguration.DEFAULT_X509_CHAININGMODE, -- cgit v1.2.3