Skip to content

endpoints-control: strip brackets of IPv6 addresses for check API #67

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

endpoints-control: strip brackets of IPv6 addresses for check API #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion endpoints-control/src/main/java/com/google/api/control/ControlFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,10 @@ private CheckRequestInfo createCheckInfo(HttpServletRequest request, String uri,
apiKey = findDefaultApiKeyParam(request);
}

// The Service Control check API expects IPv6 addresses formatted without brackets ('[' and ']'), so strip them.
String ipAddress = request.getRemoteAddr();
String strippedIpAddress = ipAddress.replace("[", "").replace("]", "");

return new CheckRequestInfo(new OperationInfo()
.setApiKey(apiKey)
.setApiKeyValid(!Strings.isNullOrEmpty(apiKey))
Expand All @@ -378,7 +382,7 @@ private CheckRequestInfo createCheckInfo(HttpServletRequest request, String uri,
.setOperationId(nextOperationId())
.setOperationName(info.getSelector())
.setServiceName(serviceName))
.setClientIp(request.getRemoteAddr())
.setClientIp(strippedIpAddress)
.setAndroidPackageName(request.getHeader(X_ANDROID_PACKAGE))
.setAndroidCertificateFingerprint(request.getHeader(X_ANDROID_CERT))
.setIosBundleId(request.getHeader(X_IOS_BUNDLE_ID));
Expand Down