fix connection leak on retrofit OAuth token renewal (#7750)

OpenAPITools · Mar 8, 2018 · 53eeb0c · 53eeb0c
1 parent 0adbf7e
commit 53eeb0c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 12 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache
@@ -113,8 +113,14 @@ public class OAuth implements Interceptor {
 
             // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
             if ( response != null && (response.code() == HTTP_UNAUTHORIZED || response.code() == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure ) {
-                if (updateAccessToken(requestAccessToken)) {
-                    return retryingIntercept( chain, false );
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept( chain, false );
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
                 }
             }
             return response;

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
@@ -113,8 +113,14 @@ public class OAuth implements Interceptor {
 
             // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
             if ( response != null && (response.code() == HTTP_UNAUTHORIZED || response.code() == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure ) {
-                if (updateAccessToken(requestAccessToken)) {
-                    return retryingIntercept( chain, false );
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept( chain, false );
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
                 }
             }
             return response;

diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuth.java
@@ -113,8 +113,14 @@ private Response retryingIntercept(Chain chain, boolean updateTokenAndRetryOnAut
 
             // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
             if ( response != null && (response.code() == HTTP_UNAUTHORIZED || response.code() == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure ) {
-                if (updateAccessToken(requestAccessToken)) {
-                    return retryingIntercept( chain, false );
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept( chain, false );
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
                 }
             }
             return response;

diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -113,8 +113,14 @@ private Response retryingIntercept(Chain chain, boolean updateTokenAndRetryOnAut
 
             // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
             if ( response != null && (response.code() == HTTP_UNAUTHORIZED || response.code() == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure ) {
-                if (updateAccessToken(requestAccessToken)) {
-                    return retryingIntercept( chain, false );
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept( chain, false );
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
                 }
             }
             return response;

diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java
@@ -113,8 +113,14 @@ private Response retryingIntercept(Chain chain, boolean updateTokenAndRetryOnAut
 
             // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
             if ( response != null && (response.code() == HTTP_UNAUTHORIZED || response.code() == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure ) {
-                if (updateAccessToken(requestAccessToken)) {
-                    return retryingIntercept( chain, false );
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept( chain, false );
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
                 }
             }
             return response;

diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -113,8 +113,14 @@ private Response retryingIntercept(Chain chain, boolean updateTokenAndRetryOnAut
 
             // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
             if ( response != null && (response.code() == HTTP_UNAUTHORIZED || response.code() == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure ) {
-                if (updateAccessToken(requestAccessToken)) {
-                    return retryingIntercept( chain, false );
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept( chain, false );
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
                 }
             }
             return response;