Skip to content

Bump microsoft-graph from 2.10.0 to 3.0.0 in /apps/backend #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skotsj merged 2 commits into from
Mar 22, 2021
Merged

Bump microsoft-graph from 2.10.0 to 3.0.0 in /apps/backend #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b5342a
Bump microsoft-graph from 2.10.0 to 3.0.0 in /apps/backend
dependabot[bot] Mar 17, 2021
91029c5
migrate microsoft-graph 3.0.0
Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions apps/backend/polly-app/src/main/java/no/nav/data/common/security/azure/AzureAdService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package no.nav.data.common.security.azure;

import com.microsoft.graph.models.extensions.IGraphServiceClient;
import com.microsoft.graph.models.UserSendMailParameterSet;
import com.microsoft.graph.requests.GraphServiceClient;
import lombok.extern.slf4j.Slf4j;
import no.nav.data.common.mail.EmailProvider;
import no.nav.data.common.mail.MailTask;
import no.nav.data.common.storage.StorageService;
import okhttp3.Request;
import org.springframework.stereotype.Service;

import static no.nav.data.common.security.azure.support.MailMessage.compose;
Expand All @@ -24,14 +26,17 @@ public AzureAdService(AzureTokenProvider azureTokenProvider, StorageService stor
@Override
public void sendMail(MailTask mailTask) {
getMailGraphClient().me()
.sendMail(compose(mailTask.getTo(), mailTask.getSubject(), mailTask.getBody()), false)
.sendMail(UserSendMailParameterSet.newBuilder()
.withMessage(compose(mailTask.getTo(), mailTask.getSubject(), mailTask.getBody()))
.withSaveToSentItems(false)
.build())
.buildRequest()
.post();

storage.save(mailTask.toMailLog());
}

private IGraphServiceClient getMailGraphClient() {
private GraphServiceClient<Request> getMailGraphClient() {
return azureTokenProvider.getGraphClient(azureTokenProvider.getMailAccessToken());
}

Expand Down
45 changes: 9 additions & 36 deletions ...backend/polly-app/src/main/java/no/nav/data/common/security/azure/AzureTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@
import com.microsoft.aad.msal4j.AuthorizationCodeParameters;
import com.microsoft.aad.msal4j.AuthorizationRequestUrlParameters;
import com.microsoft.aad.msal4j.ClientCredentialParameters;
import com.microsoft.aad.msal4j.ConfidentialClientApplication;
import com.microsoft.aad.msal4j.IAuthenticationResult;
import com.microsoft.aad.msal4j.IConfidentialClientApplication;
import com.microsoft.aad.msal4j.PublicClientApplication;
import com.microsoft.aad.msal4j.RefreshTokenParameters;
import com.microsoft.aad.msal4j.ResponseMode;
import com.microsoft.aad.msal4j.UserNamePasswordParameters;
import com.microsoft.graph.concurrency.DefaultExecutors;
import com.microsoft.graph.logger.DefaultLogger;
import com.microsoft.graph.models.extensions.IGraphServiceClient;
import com.microsoft.graph.requests.extensions.GraphServiceClient;
import com.microsoft.graph.requests.GraphServiceClient;
import com.nimbusds.oauth2.sdk.pkce.CodeChallengeMethod;
import io.prometheus.client.Summary;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import no.nav.data.common.exceptions.TechnicalException;
import no.nav.data.common.security.AuthService;
Expand All @@ -31,22 +26,21 @@
import no.nav.data.common.security.dto.OAuthState;
import no.nav.data.common.utils.Constants;
import no.nav.data.common.utils.MetricUtils;
import okhttp3.Request;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;

import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
import java.net.URL;
import java.time.Duration;
import java.util.Set;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.CompletableFuture;

import static java.util.Objects.requireNonNull;
import static no.nav.data.common.security.SecurityConstants.SESS_ID_LEN;
Expand All @@ -62,8 +56,6 @@ public class AzureTokenProvider implements TokenProvider {
private final IConfidentialClientApplication msalClient;
private final PublicClientApplication msalPublicClient;
private final AuthService authService;
private final MdcMsalExecutor msalExecutor;
private final ConfidentialClientApplication confidentialClientApplication;

private final AADAuthenticationProperties aadAuthProps;
private final Encryptor encryptor;
Expand All @@ -72,14 +64,11 @@ public class AzureTokenProvider implements TokenProvider {

public AzureTokenProvider(AADAuthenticationProperties aadAuthProps,
IConfidentialClientApplication msalClient, PublicClientApplication msalPublicClient,
AuthService authService, ThreadPoolExecutor msalThreadPool,
ConfidentialClientApplication confidentialClientApplication, Encryptor encryptor) {
AuthService authService, Encryptor encryptor) {
this.aadAuthProps = aadAuthProps;
this.msalClient = msalClient;
this.msalPublicClient = msalPublicClient;
this.authService = authService;
this.msalExecutor = new MdcMsalExecutor(msalThreadPool);
this.confidentialClientApplication = confidentialClientApplication;
this.encryptor = encryptor;
this.tokenMetrics = MetricUtils.summary()
.labels("accessToken")
Expand All @@ -97,10 +86,11 @@ public AzureTokenProvider(AADAuthenticationProperties aadAuthProps,
MetricUtils.register("accessTokenCache", accessTokenCache);
}

IGraphServiceClient getGraphClient(String accessToken) {
// buildClient has omitted it's generic type...
@SuppressWarnings("unchecked")
GraphServiceClient<Request> getGraphClient(String accessToken) {
return GraphServiceClient.builder()
.authenticationProvider(request -> request.addHeader(HttpHeaders.AUTHORIZATION, TOKEN_TYPE + accessToken))
.executors(msalExecutor)
.authenticationProvider(url -> CompletableFuture.completedFuture(accessToken))
.logger(new GraphLogger())
.buildClient();
}
Expand Down Expand Up @@ -137,7 +127,7 @@ public String createAuthRequestRedirectUrl(String postLoginRedirectUri, String p
var codeVerifier = auth.getCodeVerifier();
var s256 = DigestUtils.sha256(codeVerifier);
var codeChallenge = Base64.encodeBase64URLSafeString(s256);
URL url = confidentialClientApplication.getAuthorizationRequestUrl(AuthorizationRequestUrlParameters
URL url = msalClient.getAuthorizationRequestUrl(AuthorizationRequestUrlParameters
.builder(redirectUri, MICROSOFT_GRAPH_SCOPES)
.state(new OAuthState(auth.getId().toString(), postLoginRedirectUri, postLoginErrorUri).toJson(encryptor))
.responseMode(ResponseMode.FORM_POST)
Expand Down Expand Up @@ -227,21 +217,4 @@ private IAuthenticationResult acquireTokenByCredential(String resource) {
}
}

private static class MdcMsalExecutor extends DefaultExecutors {

static Field backgroundExecutor;

static {
backgroundExecutor = ReflectionUtils.findField(DefaultExecutors.class, "backgroundExecutor", ThreadPoolExecutor.class);
Assert.notNull(backgroundExecutor, "couldn't find executor field");
backgroundExecutor.setAccessible(true);
}

@SneakyThrows
public MdcMsalExecutor(ThreadPoolExecutor threadPoolExecutor) {
super(new DefaultLogger());
backgroundExecutor.set(this, threadPoolExecutor);
}
}

}
10 changes: 5 additions & 5 deletions ...ackend/polly-app/src/main/java/no/nav/data/common/security/azure/support/MailMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package no.nav.data.common.security.azure.support;

import com.microsoft.graph.models.extensions.EmailAddress;
import com.microsoft.graph.models.extensions.ItemBody;
import com.microsoft.graph.models.extensions.Message;
import com.microsoft.graph.models.extensions.Recipient;
import com.microsoft.graph.models.generated.BodyType;
import com.microsoft.graph.models.BodyType;
import com.microsoft.graph.models.EmailAddress;
import com.microsoft.graph.models.ItemBody;
import com.microsoft.graph.models.Message;
import com.microsoft.graph.models.Recipient;
import lombok.experimental.UtilityClass;

import java.util.List;
Expand Down
19 changes: 18 additions & 1 deletion apps/backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<logstash-logback-encoder.version>6.6</logstash-logback-encoder.version>
<docx4j.version>11.2.8</docx4j.version>

<microsoft-graph.version>2.10.0</microsoft-graph.version>
<microsoft-graph.version>3.0.0</microsoft-graph.version>
<msal4j.version>1.9.1</msal4j.version>

<!-- transitive versions -->
Expand All @@ -40,6 +40,8 @@
<guava.version>30.1-jre</guava.version>
<json-smart.version>2.3</json-smart.version>
<jna.version>5.7.0</jna.version>
<jetbrains.annotation.version>15.0</jetbrains.annotation.version>
<stax2-api.version>4.2.1</stax2-api.version>

<!-- Test -->
<testcontainers.version>1.15.2</testcontainers.version>
Expand Down Expand Up @@ -111,6 +113,21 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>${jetbrains.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>${stax2-api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down