Skip to content

Commit 9aff08f

Browse files
author
Andrew Omondi
committed
chore: adds unit tests and some documentation
1 parent 3a1a509 commit 9aff08f

File tree

12 files changed

+1026
-2
lines changed

12 files changed

+1026
-2
lines changed

‎src/main/java/com/microsoft/graph/core/models/DecryptableContent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public interface DecryptableContent {
109109
public static @Nonnull String decryptAsString(@Nonnull final DecryptableContent content, @Nonnull final CertificateKeyProvider certificateKeyProvider) throws Exception {
110110
Objects.requireNonNull(certificateKeyProvider);
111111
final Key privateKey = certificateKeyProvider.getCertificateKey(content.getEncryptionCertificateId(), content.getEncryptionCertificateThumbprint());
112-
final Cipher cipher = Cipher.getInstance("RSA/None/OAEPWithSHA1AndMGF1Padding");
112+
final Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWITHSHA1ANDMGF1PADDING");
113113
cipher.init(Cipher.DECRYPT_MODE, privateKey);
114114
final byte[] decryptedSymmetricKey = cipher.doFinal(Base64.getDecoder().decode(content.getDataKey()));
115115

‎src/main/java/com/microsoft/graph/core/models/EncryptedContentBearer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
/**
44
* Contains Decryptable content
5+
* @param <T> The type of the decryptable content
56
*/
67
public interface EncryptedContentBearer<T extends DecryptableContent> {
78

‎src/main/java/com/microsoft/graph/core/models/TokenValidable.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
/**
1717
* TokenValidable interface
18+
* @param <T> The type of the bearer of the encrypted content
19+
* @param <U> The type of the decryptable content
1820
*/
1921
public interface TokenValidable<U extends DecryptableContent, T extends EncryptedContentBearer<U>> {
2022

@@ -70,7 +72,8 @@ boolean areTokensValid(
7072
Objects.requireNonNull(appIds);
7173
Objects.requireNonNull(keyDiscoveryUrl);
7274

73-
if (collection.getValidationTokens().isEmpty()
75+
if (collection.getValidationTokens() == null
76+
|| collection.getValidationTokens().isEmpty()
7477
|| collection.getValue().stream().allMatch(x -> x.getEncryptedContent() == null)) {
7578
return true;
7679
}

‎src/test/java/com/microsoft/graph/core/models/DecryptableContentTests.java‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
package com.microsoft.graph.core.models;
2+
3+
import com.microsoft.graph.core.CoreConstants;
4+
import com.microsoft.graph.core.testModels.*;
5+
import com.microsoft.kiota.serialization.JsonParseNodeFactory;
6+
import com.microsoft.kiota.serialization.ParseNodeFactoryRegistry;
7+
import org.jetbrains.annotations.NotNull;
8+
import org.jetbrains.annotations.Nullable;
9+
import org.junit.jupiter.api.Test;
10+
11+
import java.io.ByteArrayInputStream;
12+
import java.io.IOException;
13+
import java.security.*;
14+
import java.security.cert.CertificateException;
15+
import java.util.Base64;
16+
17+
import static com.microsoft.kiota.serialization.ParseNodeFactoryRegistry.defaultInstance;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
20+
public class DecryptableContentTests {
21+
ParseNodeFactoryRegistry registry = defaultInstance;
22+
@Test
23+
void TestTokenValidWithEncryptedData() throws Exception {
24+
// Arrange
25+
registry.contentTypeAssociatedFactories.put(CoreConstants.MimeTypeNames.APPLICATION_JSON, new JsonParseNodeFactory());
26+
var testChangeNotificationEncryptedContent = new TestChangeNotificationEncryptedContent();
27+
testChangeNotificationEncryptedContent.setData("FFYlP1Bgb/fWW2kHMZiq4Y98E+XL0QTWEnGogTF6RRS+i3KqlXw35yy5ax8fEOzJbLc10ky24Ij+5ei2Hwqkzhph35XdLIsVsJZlQNYBwOu4jKvYbbhc1uHpQ/QBbs" + // pragma: allowlist secret
28+
"4IcdtWKCojqnDYcJmhwkzOZYHUr6XFHHD0GbO3y/wE0BKxMG6d5gNMfbT08OSWl+bhETeGVif8GTgZ0CNA6j7Xlq2T9Jd512cEBtEbXgJoISJVyOo4YzSirrb4R9xr" + // pragma: allowlist secret
29+
"lw9ASdz+oEzKZeUh0NSKfihjvevg90f7r5ZCHH1bP13Fxi/9NxASS7Sv28kvQbl+bqjNvCXK/Ol7rQr4DfMXPG82BGYU8n5AmWBztTY4mZLR59896coFz4CCDai4aS" + // pragma: allowlist secret
30+
"WDO1ldldvW9eqsnWTukQSwef3nHMMwTNxGge5YRMFKfVjOKr55xI7bevi2pZ6iZm8Kp8F+Gi+5V1uDpUFqeeFG3z03e7TfqczNIHdIjqxFpdYlrh/7ySd3L3q4D3TT" + // pragma: allowlist secret
31+
"vVCRdrbjuJ4oZeuFG4PQbAmJBcMwLrWDBmAykTRtrMT1Y1Ur1lX6lTiikGkrlV1VPizykLZmkq6jeoJOnMVLDWpNlQSKKfDicHRWoBHxDHc/g0aPs1g9Jd0I06YsVi" + // pragma: allowlist secret
32+
"JsEhvRz5Kwp4jAbyDff1XVExYPKRA07EfbOl5dLReE6ATcJGBr1dI4VVECRS7yW+uYTxoUUyePUOGIPGgpCBzJGYoRXKpBibcRib4Xs6WHVrEwNkN2RTHneh7NdzUm" + // pragma: allowlist secret
33+
"Piv5RoTSBFKRgysb5pWt1aUwIOnvjxLPIvTJmOob6nYvR/qCkfczEDzofYjG8H/7m2n/tqVvrs73QH7bIgapSU6GMhg41+Sizkjo4NRaIg2xrn7KM9NRJpjhsw5IyP" + // pragma: allowlist secret
34+
"Df2VgJlO9CruoCOHnbSlXCMeQUXATmXc7+bp4Zg18D2IXDryHhmc5GaBgrhzKjZtfvFzkLjY57VXODrsUB5Erya39RaX5bkqDXgzxHR3LWXZPlfuXCPKG5sPc1fGcP" + // pragma: allowlist secret
35+
"nS3+xONICej5xGxzdEo/t9esmGPWCSv3EyxBY+r7PIsNQ2gzwE5WERiRE83NHXrM1sYoSg83NqL5yZ/ohhR8lU3MTJ4xypnAglh+UdYIwqKaO4LKXaSO1Wg2MXWFAH" + // pragma: allowlist secret
36+
"BNVAYY64OrxUwm4kUS5T8CPypGKm5qHWJsWZ2dryGTwEoAKfVM5kWfhQ+56jpwN0AxCtgvGBvt7FX0S5UFa9rMf3EYgsXDQLw+o6N6W9LRC+nmQX+HTyl1mgHf/aGx" + // pragma: allowlist secret
37+
"8EW3DH3Ho52WgBf5IJ/TsvhLpDF6SKZrKLa1qm9PzShR0CGkLl+39pOT9bvcYhVW9I/mI6qv/84ben4NC0nDV31DdGTlB/pY7pIpmQuqSUQi+QAOQqO6oAYP5hh8Ey" + // pragma: allowlist secret
38+
"SQWapIyGdLE3R5HXEQJNVRYZM3BFlQ68HdPOi45KOp3PUAll3GNyxvjzE4UfeSTNGLMEll4Q2V3DlP1JcfIQNBi2SrVPtdq2A7l5NjyPoLnxKF8aoDWfunp0dAJcl" + // pragma: allowlist secret
39+
"eZNecO1YSXliGeisSiuumCTBKoLlx18XUZ4lfimtFChOnqC80RoVGSMTkM4anng99IHLUp/cOwRvnPmThGeTJX294ZsGlxrjmS3p/6DACHZKzy15GHYwhioMUDmcmX" + // pragma: allowlist secret
40+
"VYC2EkN/QPFd/nGUi6KM/dMpJ3mqXxyqP+F4d4b+Dv64QBijF5OFUffc9c46r5aoh0enIdY3TmC/hFloCQlHcrU83LBO2880TKnJI5xPbjjtZZxjA=="); // pragma: allowlist secret
41+
testChangeNotificationEncryptedContent.setDataKey("PfUrKAM9G3k7Bx3XUAQ7jJwvceKrJwO7immbL6c+cFU2RCRicRAAA35C5c2iuEItNxQoXEHBei9aalToPg6XaOVqU7Y2U0vYZ/OPJ9+7gXRk4zYdLTWQgZMeXaa" + // pragma: allowlist secret
42+
"NgJIE0xc8BCuYKacT/iB6aY9JHmj2rbR6EDbMTKWkVBe+Z/qtQFhJFq9WBLXsh719qLl/MQarYCDrTNQtryF0WXn0UuLh2OIJYV9T8eSv4j1ZM0WDKw0X9MLaqF" + // pragma: allowlist secret
43+
"PZsZ0SXX4t2EArdnrCBf5duPPCcmfhnvrimqiynSJPDQT0e63oLlpW1z37TvZTeyORY1YTQRmaKWD91fiYtuVmSSVVy2vg+Fm7UIG082bc8y7LT241Qd5RosJaf" + // pragma: allowlist secret
44+
"1w+JPZbttjm7I6uT22XOzaNRouQWx5UxRvWllm46F3pFNq0dn0lztdsW0QckAV4M86wwObVZbqUbnDZ8YloHz0XRRg7cU0H1K60fPMAo7PUoMV+bJC9HzB5O8jp" + // pragma: allowlist secret
45+
"TScDd4yOYZPB1liV2PHRHuIB23lVUARe3MuMo4i+hAc/ftK9s7yvREBuBSD0wi9R6qCygZ09YwrqfXZjRlKcFnz6EE7sqT1tzs4OxdT8XgAdveV6PU968kQhema" + // pragma: allowlist secret
46+
"TsSSrmpvsVn46mMb1le2YY5PUukxZoUFiDMZb036C56HAQ2cyWZkNweDxDQXdHOvvfmU="); // pragma: allowlist secret
47+
testChangeNotificationEncryptedContent.setDataSignature("wAtDAqtryLgLo4zhy8BOpqTjf6BYlGv1I9acDpKQo5w="); // pragma: allowlist secret
48+
testChangeNotificationEncryptedContent.setEncryptionCertificateId("custom-id-for-testing");
49+
testChangeNotificationEncryptedContent.setEncryptionCertificateThumbprint("4B95353E086AD37196606ACF834A14532F03E6DB"); // pragma: allowlist secret
50+
51+
// Act
52+
var certProvider = new DecryptableContent.CertificateKeyProvider() {
53+
@NotNull
54+
@Override
55+
public Key getCertificateKey(@Nullable String certificateId, @Nullable String certificateThumbprint) {
56+
var certificateString = "MIIQagIBAzCCEDAGCSqGSIb3DQEHAaCCECEEghAdMIIQGTCCBg8GCSqGSIb3DQEHBqCCBgAwggX8AgEAMIIF9QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIEAk4/VMAFtsCAggAgIIFyAXxkPPBcl1MbwgA3SSTHD3WBxi" + // pragma: allowlist secret
57+
"qiGVC9+0ufNW70SoIyx7V9ZVP/eFXb/moZD7BEir30WCdqqZCvh3aHvoL1SlreKXFmYqLzUViqBsHl3GIox2f/Ic7CS486JCoLHMoTHPcC3Y40zr8HX+Zc0SJs1cT4KFN3UJnoKwD+lWgn7XOiyzKWC6zksqM2spnc5W6+I5eHo" + // pragma: allowlist secret
58+
"SDEkgPa6mDYtB+0/9bPSV8XkDu9MWGUhq+bNBlenMwAF+QeWBbaTskiEHgloJPzqVop8aT/KRsKLNBrWQ64JJ5dYG/yjqg0/oA//T8/cCDqhTuc0FiS4IRzmKnTsOuVgbwJ8t3vvd6lHRfFZXTYnMmRLuZ62xvzsAIRCg6+CUmU" + // pragma: allowlist secret
59+
"fJB9SZodYMD1dC3ScIHoNbbgJUfbUOriC9lL6kLPdxBOAmICMy+47t1PvmFpFJe0fzz8M26Lg5Bbc+pVdwKBDXa2+15Dw/vSiTZuEq1e5C/EJwZDzKU9cskqONGeegxSMDlY12vJR2eY6m/fVrpu58QTAi9kkl5+U4naQp4WXMy" + // pragma: allowlist secret
60+
"9EydbqNWge1Y3CFxZBldktC6PajhjAF83mMaohAZ+91SfTLx2bar8vxWxCTePSwci2vyZDrzSCvogaNa4CMJViz7Vfbzof4WOTw5tYin9cCNHQuw47hLDVZtIevavAkwruwmXNbd1l7lr9433AdBRh9iiG6uMpwJYAPwj8lkGDU" + // pragma: allowlist secret
61+
"1H0MFBYjvWMVdh3S4KUkN6kIZPCryFcBKWvqmZn0tVpCbtIlCARXEoz2iYR+VydRW0C5+BlnYCCL60rylirKlRQSm4yzY6vr3wFjWxtEn4SMdR8HUhT7EqAel6AIYO9ZFsJ76GK994l/QMy++pjd4HRIw3SSNoshzQA+y9+MWcP" + // pragma: allowlist secret
62+
"sUMUj0gS+9NXr/GZ/G4m1gWnuFOnulUWXYD1CctimampvaPwdcWKrUKnzUeMFYxMkMdycEkfePPw4oTYHw5/OgBv4/3PNuuIDBwA0XNop9ixrcNtT+O2eqyITIJLZ6xcxS8aVvrGeGcKs+u0CC4mqvKKVXPLYJ7qN1lznHVEMB7" + // pragma: allowlist secret
63+
"97JM3SQyhGcYXOqDRV4GlXbAPYbH7P7pbepTF/Y2TascDkcpmX3UeglK6L/zcNG2X+RdjVrJpeNCYVHt9xgQ2eIb9O+6U5eBt25UeUjqa1JBcHf1/XcMIp5+Tf0xO00xV+faI9vXFk5C3DuEOQh6E7Gmp+aPa/s9H/4yV2teuYJ" + // pragma: allowlist secret
64+
"SxXkszbTvy5bC0C00rD9qFsQORNnZM1MePzbQ0CNAadNiDzdOluDRruwKAGWtxjnjqzMOxfRBZwx2AJfc7EO2zgUaUpoCQQ+Aznnt1zHoWsTP1HcloE3MginzLi76PwwEMbvnc6U2stqsbkENqX6O1OahqeP9C98qlXt12j8vmV" + // pragma: allowlist secret
65+
"xbFbLRFJYEDkv3hEIOkZmfIUZZ7PtQG6pcz4MXy8VNubgrz1BKd1FDiajGEN9w0z18sszjVRogiTIuST47eN473PmeqMuQDKf4w+nFsQbPYC7Ldxd+DHCdDVXpEeF3ImtmB5cvZnL8VSnCit8Uarws9tj8NCL0RaCJa5aAWGdkb" + // pragma: allowlist secret
66+
"9+Se4A1sBLn60lODQ0VLGg6M3GQYlLKkGFDNZ13SfBlEzehOE3yIPo+BD2kFoR0Tp1ITMj5CX88EZ30CY1u0vDtjHlFnvCcUcCxA5Ck8QaVR+3ghdUCFyZWjc7pd6ivRnH1AUO3f3HJq+UYbBHvKEG6UYviPGypijsH+4utOdxU" + // pragma: allowlist secret
67+
"sLCp7Xo06ieotorfbTLMkLcp6G0PykLbT7D+B5f+XNfB5pvjIzB5qo7b9tq4KzVVm67aBCRWF9UQP59/XbHpTL8UCHPB5StAkZNSfaqFIetiJFbYhRK40G5eOiUShX3SZnwxejRb91TrR4in3HuiB8VvAxxzozqJrFBT02XiNuG" + // pragma: allowlist secret
68+
"3EzW215isLunbU7o3w2ZVrspwWDNJV1kWv0gtg4rls+vt/jSQ+lhwGiZHHVw7WPlnzMwggoCBgkqhkiG9w0BBwGgggnzBIIJ7zCCCeswggnnBgsqhkiG9w0BDAoBAqCCCW4wgglqMBwGCiqGSIb3DQEMAQMwDgQIAE5+HZYwEY8" + // pragma: allowlist secret
69+
"CAggABIIJSEPsDMNEgZJkFSZUJZ8cuCA1E2e9/jJUu3RPzhoUMRjx++17zprL5LVF4vfQ2Dgd16pQ/IdP2yhK+YHfWvjYvo9E/xPx2V6qXzC7r1VyO0qZSmYuYhVIlMo+vrexuT0UeWQvjXX72DLVcixCGWrUf8qt9CqofChyjn" + // pragma: allowlist secret
70+
"UddsD9hdoWgNSTgBMi6aNFxlFFfeJMOeTfUbFOGAnUFwySWUnwA3Lx7NrcKWLngmvmyo/zl8++M528SeEGAT7jeZ3NdkI8OqCWlE77ybmZYHXJRgq4D01oVdiQAgnd3Wj8sKmrjIByc23IdIrusHgM5b9BYXdsiEo3seJ6H4V4B" + // pragma: allowlist secret
71+
"tG5KOPFpM3m2KwZDtlLfgj4Od/XbyZwtRkLOVvOA8ARtDPlfIR8nW+ptFpMlaWGX72oreMm6utQ3OWJtjx+xFKm+VgVhJpJrt1NC1U1vnVp3apwcSXB66nf6gxfipQoUubUoFqUbIBA6lVECVN2XQcO9oHF4exOxAXA0/R45dMm" + // pragma: allowlist secret
72+
"UIRAc81x6B5I/sRWxYybwtWDUvilLdpjmgzjrQZM8S7EiG13r8mRbYXgtAHFxDv80DYZuywutclEYrFEVoXLGmXBXqlw/uFRQq9ee9xFbrYet8nYCIsUhPc5xF3bLG5bNaIhNrey3+53PlX6ralAfDmCFUHFor2pVnMP0HxG7bq" + // pragma: allowlist secret
73+
"8ylUNzIVbcliDFIeukdF0fBc0L7VtGaXKLKSZPx7QE4W3dzGRkBPTuG13wOf7batwdV5AwBUoNXLKqbvzqj/M6LgCTdtZ0Qlf7MKH1Av2aYxIV9m/053CKL3tmCj06EkuTWhmMQcfckrnMoInVrmgOpsjX0nQ1EaxkglJtpm2u0" + // pragma: allowlist secret
74+
"MKN7f9liXOzg5x1aUvIIEddJUxTnpbcl8AEGnPuZvScsQ9JajbRA8v+0gv+qLIgh4esC+AV4ufRV01HOjA/30S1WTAykU+HPvLq/goz8SwtLVmD9F1n5ppWULLYbQObKVUmGiJWjvFDdVtuR4XA1SpBO6nC4wL/Qe2CG360uj9s" + // pragma: allowlist secret
75+
"zvgDXYVF108/Xr/pJqwHhyb3dujsPre73zS2AWjKPRC/qbe+LZw+Yj4KVD3MslFg14CkS/TPK1zdUyBEnNJIBatbp28/NNX3bMd2TaB7mIlr4T2iSQI4yf5U5gxnPXGOUeqLqKbi7iUbHHk6407PkyIZPyBxUaSIi/KtpUkGvY+" + // pragma: allowlist secret
76+
"aTAtLLA5F6tKp6FpsvbGBUkOCBcAMLc36Se9GG6UfBf6ZIFtZBpugp4+aZlKxzzigEF+8S4v4/4lm4HcLE7dC8ChD+fPtAQqqMjWmJnrp1Jm20URW//8mk7WVzNTEPuRIeFXTLw52pRtO6E51V085lX3cvEvNgcN3GiCnztb5W7" + // pragma: allowlist secret
77+
"Tx5eYFGbkXKhmc8OSbNZ1QfAlWwPyVumFujC7bLiCp6V9R0MMUlGY6BiJwFNGM0Isoz7v3Y2DLlYdztdNto9I1+73mMXsCnsCmQTE4pqjGX4imva64pIELuQ2AE2ecAZ7/J/v3DXhsgUXkAnjZIvqnAr/UOBkDDjLc7xByGEkzD" + // pragma: allowlist secret
78+
"D0PFQclF4ehxo8s8ttUT9VXmLuWgj1inbIU7gcTWaVZFA+4cTeuKDfOCQ+LNaYrv3EZ96FuEO/Dj0Eo+7iiIvWm13ggN+39Bmbp+nerB2r0geAOO6QiPIRD8v2Slwv2Pv3CrBhSX9mVAFt195ZFd3sojhGgqlcJ4tRdV/pGb5At" + // pragma: allowlist secret
79+
"4T4D0qcRop3aOQ9UST5e1Gmc2w3+z07tCEBsp+teQurAVjX7laEHhA2oavJii9DGAau94X63lURBEQmX8EE6b/9k432dTw5evCkzzO3XMyssvXuEHeuSPnFnLkHFrn9IuHh9LkZvTkQbXRuVVhjnmrfy8Hgq9hK/Tgfax0vow8G" + // pragma: allowlist secret
80+
"v3CVPptYxL6uo+N4aHHROU4IkOiaV8hUIRFeKh6uE8ILDxWKo+QT5i1iwsm6mhm4cZno7NxCseIXmveU47qhJ/FuwMRVzUfvIzeanEoNUUEEyurqgDSJWqtZLHa9N2FbHHbR30YF7HekH48mvB7MXcHywHEcgMo8rL4I1F820Bd" + // pragma: allowlist secret
81+
"tLL4xXc1g0NoFWpnrBavoi6mCNcqc4eULIcF5MPg9k1xE663Sw6xlrVKEgXDHHivsv4Y0D5EYRxcqeOkkQ4AwH0a7Y7ps2ZsUxVenXtBqSeaGgY5tY4GX55+ko9tyyOkVV9XT6JcBfCxPtwEeyV+oVlMRg9alVCiw7scMeFFDiH" + // pragma: allowlist secret
82+
"+4a6CI/J0hyluBjuChypu6i1UjJDC+GloiyiiRktBw1b7Hytg5w8u9tTMNCVNHWLuvGSmzPyYymAIiRSqrCtVH/APv+SWtGC+eNh5+mZc0hz7hHi6gmc7zB/58+VVOdm0vqGaQx28uv5Pht5yw7KgKgtFt//0KvAsCKYso6FsTU" + // pragma: allowlist secret
83+
"4IzJL3uBPp20xb5Vka4I69c3ysd8Jcx2Y3fykech34fhRLIqJRBo42+ekhAEkF5nZTVFBYgOFv6jir4gTxI4Bax6ukBNDQYDY9VL+dIDU1/PPtepHRNB6lqlKX4Y5T6tqn8u5UbeMVug+ket0oaQ4SObAOkrJdgyE1aGXfSYGoD" + // pragma: allowlist secret
84+
"vOYz8OCFWNJjDECCrZgniKbV+fxgcOExbXD1Au9W0wgHnagT+uoik0rshi6nsIel4XmVv/MiQowK35s6Olq4mrdRPoOwoePuo3/CEL+BwRlX0aJhFgRS5O0L/zD8Hc8EPR6CO9+8jbkbBQ80KnVsS25ArgoA45CSFCrmqRxFnnp" + // pragma: allowlist secret
85+
"R6Dvlr0EmlDfGOnFlnZXZNIuPYZZT6UbH0ObaxDKYMPZ2NRbfETfdDHM+WBPuqGVc6OiMqa7PFkHjispf7saXtSrcpL+UYvNzX4PQwpUi8frl0Aq7w7c8GKosmaNp3VYiTc9cAcd/JlX5dAZK2yndVpmQlUeA028j5Lyc9Hm9Gn" + // pragma: allowlist secret
86+
"T6wjPT4x2lYvXd+AwOBY/3CY2eAslCN+4nmoRZnovDH4Ffp2bnId9FrsViBDWLKWV63yN2OTnTPJxj7ZQEC6T78sdqEpw5vKdi3xYYj2MhBXNohE0lK3Ig4ijsB9P16bXA8PcKaIwhnpeTKsLcdBPwVapuDku24u4u/Z/A+Q3Ls" + // pragma: allowlist secret
87+
"lbEJdiRhGrHv6I+MJd2Gx/1qBU6VO4N/vC/VL3uv5VY/zRcA4r4ff7m7nfsuwyz5JsLMIcQEx0LuKyy74XmayhpdDE1RlovO0+JkzFmMCMGCSqGSIb3DQEJFTEWBBRLlTU+CGrTcZZgas+DShRTLwPm2zA/BgkqhkiG9w0BCRQx" + // pragma: allowlist secret
88+
"Mh4wAHIAaQBjAGgAbgBvAHQAaQBmAGkAYwBhAHQAaQBvAG4AcwBhAHAAcAAuAGMAbwBtMDEwITAJBgUrDgMCGgUABBShhhfLZmAOmqGltImT+9krDrQGAgQId7jD11L05jECAggA"; // pragma: allowlist secret
89+
byte[] decodedKey = Base64.getDecoder().decode(certificateString);
90+
try {
91+
String caPassword = "rich"; // pragma: allowlist secret
92+
KeyStore ks = KeyStore.getInstance("PKCS12");
93+
ks.load(new ByteArrayInputStream(decodedKey), caPassword.toCharArray());
94+
return ks.getKey("richnotificationsapp.com",caPassword.toCharArray());
95+
} catch (NoSuchAlgorithmException e) {
96+
throw new RuntimeException(e);
97+
} catch (CertificateException e) {
98+
throw new RuntimeException(e);
99+
} catch (KeyStoreException e) {
100+
throw new RuntimeException(e);
101+
} catch (IOException e) {
102+
throw new RuntimeException(e);
103+
} catch (UnrecoverableKeyException e) {
104+
throw new RuntimeException(e);
105+
}
106+
}
107+
};
108+
109+
var chatMessage = DecryptableContent.decrypt(testChangeNotificationEncryptedContent,certProvider, TestChatMessage::createFromDiscriminatorValue);
110+
111+
// Assert that decryption is okay and we have a valid property(etag)!!
112+
assertEquals("1625126194597", chatMessage.getETag());
113+
}
114+
}

‎src/test/java/com/microsoft/graph/core/models/TokenValidableTests.java‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
package com.microsoft.graph.core.models;
2+
3+
import com.microsoft.graph.core.testModels.TestChangeNotification;
4+
import com.microsoft.graph.core.testModels.TestChangeNotificationCollection;
5+
import com.microsoft.graph.core.testModels.TestChangeNotificationEncryptedContent;
6+
import org.junit.jupiter.api.Test;
7+
8+
import java.util.ArrayList;
9+
import java.util.List;
10+
import java.util.UUID;
11+
12+
import static org.junit.jupiter.api.Assertions.*;
13+
14+
public class TokenValidableTests {
15+
@Test
16+
void TestTokenValidWithNoValidationTokens() {
17+
var testChangeNotification = new TestChangeNotificationCollection ();
18+
var tenantIds = new ArrayList<UUID>();
19+
var appIds = new ArrayList<UUID>();
20+
var result = TokenValidable.areTokensValid(testChangeNotification,tenantIds,appIds);
21+
assertTrue(result);
22+
}
23+
24+
@Test
25+
void TestTokenValidWithNoEncryptedData() {
26+
var testChangeNotificationCollection = new TestChangeNotificationCollection ();
27+
var testTokens = new ArrayList<String>();
28+
testTokens.add("testToken");
29+
testChangeNotificationCollection.setValidationTokens(testTokens);
30+
var testNotifications = new ArrayList<TestChangeNotification>();
31+
var testChangeNotification = new TestChangeNotification();
32+
testNotifications.add(testChangeNotification);
33+
testChangeNotificationCollection.setValue(testNotifications);
34+
var tenantIds = new ArrayList<UUID>();
35+
var appIds = new ArrayList<UUID>();
36+
var result = TokenValidable.areTokensValid(testChangeNotificationCollection,tenantIds,appIds);
37+
assertTrue(result); // no encrypted content
38+
}
39+
@Test
40+
void TestTokenValidWithEncryptedDataAndNoParameters() {
41+
var testChangeNotificationCollection = new TestChangeNotificationCollection ();
42+
var testTokens = new ArrayList<String>();
43+
testTokens.add("testToken");
44+
testChangeNotificationCollection.setValidationTokens(testTokens);
45+
var testNotifications = new ArrayList<TestChangeNotification>();
46+
var testChangeNotification = new TestChangeNotification();
47+
var testEncryptedContent = new TestChangeNotificationEncryptedContent();
48+
testChangeNotification.setEncryptedContent(testEncryptedContent);
49+
testNotifications.add(testChangeNotification);
50+
testChangeNotificationCollection.setValue(testNotifications);
51+
var tenantIds = new ArrayList<UUID>();
52+
var appIds = new ArrayList<UUID>();
53+
assertThrows(IllegalArgumentException.class,() -> TokenValidable.areTokensValid(testChangeNotificationCollection,tenantIds,appIds));
54+
}
55+
56+
@Test
57+
void TestTokenValidWithEncryptedData() {
58+
var testChangeNotificationCollection = new TestChangeNotificationCollection ();
59+
var testTokens = new ArrayList<String>();
60+
testTokens.add("testToken");
61+
testChangeNotificationCollection.setValidationTokens(testTokens);
62+
var testNotifications = new ArrayList<TestChangeNotification>();
63+
var testChangeNotification = new TestChangeNotification();
64+
var testEncryptedContent = new TestChangeNotificationEncryptedContent();
65+
testChangeNotification.setEncryptedContent(testEncryptedContent);
66+
testNotifications.add(testChangeNotification);
67+
testChangeNotificationCollection.setValue(testNotifications);
68+
var tenantIds = new ArrayList<UUID>();
69+
tenantIds.add(UUID.randomUUID());
70+
var appIds = new ArrayList<UUID>();
71+
appIds.add(UUID.randomUUID());
72+
var exception = assertThrows(IllegalArgumentException.class,() -> TokenValidable.areTokensValid(testChangeNotificationCollection,tenantIds,appIds));
73+
assertEquals("Invalid token",exception.getMessage()); // issuer for the token is invalid
74+
}
75+
}

0 commit comments

Comments
 (0)