Remove AccessController.doPrivileged calls

bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java

@@ -18,9 +18,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.time.Instant;
 import java.util.Base64;
 import java.util.concurrent.ExecutionException;
@@ -137,7 +134,7 @@ public String getAuthorizationUrl(String authorizationEndpoint, String clientId,
      * @return Access Token
      * @throws IOException IO/ network exceptions
      * @throws OAuthException Other exceptions
-     * @throws OAuthErrorException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
+     * @throws OAuthResponseException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
      *             Response
      */
     public AccessTokenResponse grantTypePassword(String tokenUrl, String username, String password,
@@ -171,7 +168,7 @@ public AccessTokenResponse grantTypePassword(String tokenUrl, String username, S
      * @return Access Token
      * @throws IOException IO/ network exceptions
      * @throws OAuthException Other exceptions
-     * @throws OAuthErrorException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
+     * @throws OAuthResponseException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
      *             Response
      */
     public AccessTokenResponse grantTypeRefreshToken(String tokenUrl, String refreshToken, @Nullable String clientId,
@@ -206,7 +203,7 @@ public AccessTokenResponse grantTypeRefreshToken(String tokenUrl, String refresh
      * @return Access Token
      * @throws IOException IO/ network exceptions
      * @throws OAuthException Other exceptions
-     * @throws OAuthErrorException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
+     * @throws OAuthResponseException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
      *             Response
      */
     public AccessTokenResponse grantTypeAuthorizationCode(String tokenUrl, String authorizationCode, String clientId,
@@ -240,7 +237,7 @@ public AccessTokenResponse grantTypeAuthorizationCode(String tokenUrl, String au
      * @return Access Token
      * @throws IOException IO/ network exceptions
      * @throws OAuthException Other exceptions
-     * @throws OAuthErrorException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
+     * @throws OAuthResponseException Error codes given by authorization provider, as in RFC 6749 section 5.2 Error
      *             Response
      */
     public AccessTokenResponse grantTypeClientCredentials(String tokenUrl, String clientId,
@@ -301,11 +298,8 @@ private AccessTokenResponse doRequest(final String grantType, HttpClient httpCli
         String content = "";
         try {
             final FormContentProvider entity = new FormContentProvider(fields);
-            final ContentResponse response = AccessController
-                    .doPrivileged((PrivilegedExceptionAction<ContentResponse>) () -> {
-                        Request requestWithContent = request.content(entity);
-                        return requestWithContent.send();
-                    });
+            Request requestWithContent = request.content(entity);
+            final ContentResponse response = requestWithContent.send();
 
             statusCode = response.getStatus();
             content = response.getContentAsString();
@@ -326,18 +320,15 @@ private AccessTokenResponse doRequest(final String grantType, HttpClient httpCli
                         statusCode);
                 throw new OAuthException("Bad http response, http code " + statusCode);
             }
-        } catch (PrivilegedActionException pae) {
-            Exception underlyingException = pae.getException();
-            if (underlyingException instanceof InterruptedException || underlyingException instanceof TimeoutException
-                    || underlyingException instanceof ExecutionException) {
-                throw new IOException("Exception in oauth communication, grant type " + grantType, underlyingException);
-            }
-            // Dont know what exception it is, wrap it up and throw it out
-            throw new OAuthException("Exception in oauth communication, grant type " + grantType, underlyingException);
+        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+            throw new IOException("Exception in oauth communication, grant type " + grantType, e);
         } catch (JsonSyntaxException e) {
             throw new OAuthException(String.format(
-                    "Unable to deserialize json into AccessTokenResponse/ OAuthResponseException. httpCode: %i json: %s",
+                    "Unable to deserialize json into AccessTokenResponse/ OAuthResponseException. httpCode: %d json: %s",
                     statusCode, content), e);
+        } catch (Exception e) {
+            // Dont know what exception it is, wrap it up and throw it out
+            throw new OAuthException("Exception in oauth communication, grant type " + grantType, e);
         }
     }
 
@@ -356,10 +347,7 @@ private HttpClient createHttpClient(String tokenUrl) throws OAuthException {
         HttpClient httpClient = httpClientFactory.createHttpClient(HTTP_CLIENT_CONSUMER_NAME);
         if (!httpClient.isStarted()) {
             try {
-                AccessController.doPrivileged((PrivilegedExceptionAction<@Nullable Void>) () -> {
-                    httpClient.start();
-                    return null;
-                });
+                httpClient.start();
             } catch (Exception e) {
                 throw new OAuthException("Exception while starting httpClient, tokenUrl: " + tokenUrl, e);
             }
@@ -370,10 +358,7 @@ private HttpClient createHttpClient(String tokenUrl) throws OAuthException {
     private void shutdownQuietly(@Nullable HttpClient httpClient) {
         try {
             if (httpClient != null) {
-                AccessController.doPrivileged((PrivilegedExceptionAction<@Nullable Void>) () -> {
-                    httpClient.stop();
-                    return null;
-                });
+                httpClient.stop();
             }
         } catch (Exception e) {
             // there is nothing we can do here

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/TriggerHandlerCallbackImpl.java

@@ -12,8 +12,6 @@
  */
 package org.openhab.core.automation.internal;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -92,10 +90,7 @@ public void run() {
 
     public void dispose() {
         synchronized (this) {
-            AccessController.doPrivileged((PrivilegedAction<@Nullable Void>) () -> {
-                executor.shutdownNow();
-                return null;
-            });
+            executor.shutdownNow();
         }
     }
 

bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java

@@ -12,8 +12,6 @@
  */
 package org.openhab.core.config.discovery;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,12 +173,7 @@ private void validateThingUID(@Nullable ThingUID bridgeUID) {
     }
 
     private String getStackTrace(final Thread thread) {
-        StackTraceElement[] elements = AccessController.doPrivileged(new PrivilegedAction<StackTraceElement[]>() {
-            @Override
-            public StackTraceElement[] run() {
-                return thread.getStackTrace();
-            }
-        });
+        StackTraceElement[] elements = thread.getStackTrace();
         return Arrays.stream(elements).map(element -> "\tat " + element.toString()).collect(Collectors.joining("\n"));
     }
 }

bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java

@@ -12,8 +12,6 @@
  */
 package org.openhab.core.config.discovery.internal;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -254,13 +252,7 @@ public synchronized void thingDiscovered(final DiscoveryService source, final Di
         }
         for (final DiscoveryListener listener : listeners) {
             try {
-                AccessController.doPrivileged(new PrivilegedAction<@Nullable Void>() {
-                    @Override
-                    public @Nullable Void run() {
-                        listener.thingDiscovered(source, result);
-                        return null;
-                    }
-                });
+                listener.thingDiscovered(source, result);
             } catch (Exception ex) {
                 logger.error("Cannot notify the DiscoveryListener '{}' on Thing discovered event!",
                         listener.getClass().getName(), ex);
@@ -280,13 +272,7 @@ public synchronized void thingRemoved(final DiscoveryService source, final Thing
         }
         for (final DiscoveryListener listener : listeners) {
             try {
-                AccessController.doPrivileged(new PrivilegedAction<@Nullable Void>() {
-                    @Override
-                    public @Nullable Void run() {
-                        listener.thingRemoved(source, thingUID);
-                        return null;
-                    }
-                });
+                listener.thingRemoved(source, thingUID);
             } catch (Exception ex) {
                 logger.error("Cannot notify the DiscoveryListener '{}' on Thing removed event!",
                         listener.getClass().getName(), ex);
@@ -300,13 +286,8 @@ public synchronized void thingRemoved(final DiscoveryService source, final Thing
         Set<ThingUID> removedResults = new HashSet<>();
         for (final DiscoveryListener listener : listeners) {
             try {
-                Collection<ThingUID> olderResults = AccessController
-                        .doPrivileged(new PrivilegedAction<@Nullable Collection<ThingUID>>() {
-                            @Override
-                            public @Nullable Collection<ThingUID> run() {
-                                return listener.removeOlderResults(source, timestamp, thingTypeUIDs, bridgeUID);
-                            }
-                        });
+                Collection<ThingUID> olderResults = listener.removeOlderResults(source, timestamp, thingTypeUIDs,
+                        bridgeUID);
                 if (olderResults != null) {
                     removedResults.addAll(olderResults);
                 }