Skip to content

Commit 9369f25

Browse files
wzy1935wzy1935
committed
add tests
1 parent 82dee8a commit 9369f25

10 files changed

+756
-86
lines changed

‎src/main/java/io/vertx/httpproxy/impl/CacheControl.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public CacheControl parse(String header) {
4141
_private = false;
4242
proxyRevalidate = false;
4343
_public = false;
44+
maxAge = -1;
45+
maxStale = -1;
46+
minFresh = -1;
47+
sMaxage = -1;
4448

4549
String[] parts = header.split(","); // No regex
4650
for (String part : parts) {
@@ -74,10 +78,10 @@ public CacheControl parse(String header) {
7478
proxyRevalidate = true;
7579
break;
7680
default:
77-
maxAge = loadInt(part, "max-age=");
78-
maxStale = loadInt(part, "max-stale=");
79-
minFresh = loadInt(part, "min-fresh=");
80-
sMaxage = loadInt(part, "s-maxage=");
81+
maxAge = Math.max(maxAge, loadInt(part, "max-age="));
82+
maxStale = Math.max(maxStale, loadInt(part, "max-stale="));
83+
minFresh = Math.max(minFresh, loadInt(part, "min-fresh="));
84+
sMaxage = Math.max(sMaxage, loadInt(part, "s-maxage="));
8185
break;
8286
}
8387
}

‎src/main/java/io/vertx/httpproxy/impl/CachingFilter.java

+82-61
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
import io.vertx.httpproxy.spi.cache.Resource;
1515

1616
import java.time.Instant;
17+
import java.util.ArrayList;
1718
import java.util.List;
1819
import java.util.Map;
1920

2021
class CachingFilter implements ProxyInterceptor {
2122

23+
private static final String SKIP_CACHE_RESPONSE_HANDLING = "skip_cache_response_handling";
24+
private static final String CACHED_RESOURCE = "cached_resource";
25+
2226
private final Cache cache;
2327

2428
public CachingFilter(Cache cache) {
@@ -32,14 +36,19 @@ public Future<ProxyResponse> handleProxyRequest(ProxyContext context) {
3236

3337
@Override
3438
public Future<Void> handleProxyResponse(ProxyContext context) {
35-
return sendAndTryCacheProxyResponse(context);
39+
Boolean skip = context.get(SKIP_CACHE_RESPONSE_HANDLING, Boolean.class);
40+
if (skip != null && skip) {
41+
return context.sendResponse();
42+
} else {
43+
return sendAndTryCacheProxyResponse(context);
44+
}
3645
}
3746

3847
private Future<Void> sendAndTryCacheProxyResponse(ProxyContext context) {
3948

4049
ProxyResponse response = context.response();
4150
ProxyRequest request = response.request();
42-
Resource cached = context.get("cached_resource", Resource.class);
51+
Resource cached = context.get(CACHED_RESOURCE, Resource.class);
4352
String absoluteUri = request.absoluteURI();
4453

4554
if (cached != null && response.getStatusCode() == 304) {
@@ -65,7 +74,7 @@ private Future<Void> sendAndTryCacheProxyResponse(ProxyContext context) {
6574
canCache = false;
6675
}
6776
}
68-
if (response.headers().get(HttpHeaders.AUTHORIZATION) != null) {
77+
if (request.headers().get(HttpHeaders.AUTHORIZATION) != null) {
6978
if (
7079
responseCacheControl == null || (
7180
!responseCacheControl.isMustRevalidate()
@@ -78,6 +87,9 @@ private Future<Void> sendAndTryCacheProxyResponse(ProxyContext context) {
7887
if (requestCacheControl != null && requestCacheControl.isNoStore()) {
7988
canCache = false;
8089
}
90+
if ("*".equals(response.headers().get(HttpHeaders.VARY))) {
91+
canCache = false;
92+
}
8193
if (canCache) {
8294
if (request.getMethod() == HttpMethod.GET) {
8395
Resource res = new Resource(
@@ -114,9 +126,6 @@ private static MultiMap varyHeaders(MultiMap requestHeaders, MultiMap responseHe
114126
MultiMap result = MultiMap.caseInsensitiveMultiMap();
115127
String vary = responseHeaders.get(HttpHeaders.VARY);
116128
if (vary != null) {
117-
if (vary.trim().equals("*")) {
118-
return result.addAll(requestHeaders);
119-
}
120129
for (String toVary : vary.split(",")) {
121130
toVary = toVary.trim();
122131
String toVaryValue = requestHeaders.get(toVary);
@@ -149,63 +158,22 @@ private Future<ProxyResponse> tryHandleProxyRequestFromCache(ProxyContext contex
149158
return cache.get(cacheKey).compose(resource -> {
150159
if (resource == null || !checkVaryHeaders(proxyRequest.headers(), resource.getRequestVaryHeader())) {
151160
if (requestCacheControl != null && requestCacheControl.isOnlyIfCached()) {
161+
context.set(SKIP_CACHE_RESPONSE_HANDLING, true);
152162
return Future.succeededFuture(proxyRequest.release().response().setStatusCode(504));
153163
}
154164
return context.sendRequest();
155165
}
156166

157-
boolean validInboundCache = false;
158-
String inboundIfModifiedSince = inboundRequest.getHeader(HttpHeaders.IF_MODIFIED_SINCE);
159-
String inboundIfNoneMatch = inboundRequest.getHeader(HttpHeaders.IF_NONE_MATCH);
160-
Instant resourceLastModified = resource.getLastModified();
161-
String resourceETag = resource.getEtag();
162-
if (resource.getStatusCode() == 200) { // TODO: status code 206
163-
if (inboundIfNoneMatch != null && resourceETag != null) {
164-
String[] inboundETags = inboundIfNoneMatch.split(",");
165-
for (String inboundETag : inboundETags) {
166-
inboundETag = inboundETag.trim();
167-
if (inboundETag.equals(resourceETag)) {
168-
validInboundCache = true;
169-
break;
170-
}
171-
return context.sendRequest();
172-
}
173-
} else if (inboundIfModifiedSince != null && resourceLastModified != null) {
174-
if (ParseUtils.parseHeaderDate(inboundIfModifiedSince).isAfter(resourceLastModified)) { // TODO: is it wrong???
175-
validInboundCache = true;
176-
}
177-
}
178-
}
179-
if (validInboundCache) {
180-
MultiMap infoHeaders = MultiMap.caseInsensitiveMultiMap();
181-
List<CharSequence> headersNeeded = List.of(
182-
HttpHeaders.CACHE_CONTROL,
183-
HttpHeaders.CONTENT_LOCATION,
184-
HttpHeaders.DATE,
185-
HttpHeaders.ETAG,
186-
HttpHeaders.EXPIRES,
187-
HttpHeaders.VARY
188-
);
189-
for (CharSequence header : headersNeeded) {
190-
String value = resource.getHeaders().get(header);
191-
if (value != null) infoHeaders.add(header, value);
192-
}
193-
ProxyResponse resp = proxyRequest.release().response();
194-
resp.headers().setAll(infoHeaders);
195-
resp.setStatusCode(304);
196-
return Future.succeededFuture(resp);
197-
}
198-
167+
// to check if the resource is fresh
199168
boolean needValidate = false;
200169
String resourceCacheControlHeader = resource.getHeaders().get(HttpHeaders.CACHE_CONTROL);
201170
CacheControl resourceCacheControl = resourceCacheControlHeader == null ? null : new CacheControl().parse(resourceCacheControlHeader);
202171
if (resourceCacheControl != null && resourceCacheControl.isNoCache()) needValidate = true;
203172
if (requestCacheControl != null && requestCacheControl.isNoCache()) needValidate = true;
204173
long age = Math.subtractExact(System.currentTimeMillis(), resource.getTimestamp()); // in ms
205174
long maxAge = Math.max(0, resource.getMaxAge());
206-
if (resourceCacheControl != null && (resourceCacheControl.isMustRevalidate() || resourceCacheControl.isProxyRevalidate())) {
207-
if (age > maxAge) needValidate = true;
208-
} else if (requestCacheControl != null) {
175+
boolean responseValidateOverride = resourceCacheControl != null && (resourceCacheControl.isMustRevalidate() || resourceCacheControl.isProxyRevalidate());
176+
if (!responseValidateOverride && requestCacheControl != null) {
209177
if (requestCacheControl.maxAge() != -1) {
210178
maxAge = Math.min(maxAge, SafeMathUtils.safeMultiply(requestCacheControl.maxAge(), 1000));
211179
}
@@ -214,8 +182,8 @@ private Future<ProxyResponse> tryHandleProxyRequestFromCache(ProxyContext contex
214182
} else if (requestCacheControl.maxStale() != -1) {
215183
maxAge += SafeMathUtils.safeMultiply(requestCacheControl.maxStale(), 1000);
216184
}
217-
if (age > maxAge) needValidate = true;
218185
}
186+
if (age > maxAge) needValidate = true;
219187
String etag = resource.getHeaders().get(HttpHeaders.ETAG);
220188
String lastModified = resource.getHeaders().get(HttpHeaders.LAST_MODIFIED);
221189
if (needValidate) {
@@ -225,13 +193,68 @@ private Future<ProxyResponse> tryHandleProxyRequestFromCache(ProxyContext contex
225193
if (lastModified != null) {
226194
proxyRequest.headers().set(HttpHeaders.IF_MODIFIED_SINCE, lastModified);
227195
}
228-
context.set("cached_resource", resource);
196+
context.set(CACHED_RESOURCE, resource);
229197
return context.sendRequest();
230198
} else {
231-
proxyRequest.release();
232-
ProxyResponse proxyResponse = proxyRequest.response();
233-
resource.init(proxyResponse, inboundRequest.method() == HttpMethod.GET);
234-
return Future.succeededFuture(proxyResponse);
199+
// check if the client already have valid cache using current cache
200+
boolean validInboundCache = false;
201+
Instant inboundIfModifiedSince = ParseUtils.parseHeaderDate(inboundRequest.getHeader(HttpHeaders.IF_MODIFIED_SINCE));
202+
String inboundIfNoneMatch = inboundRequest.getHeader(HttpHeaders.IF_NONE_MATCH);
203+
Instant resourceLastModified = resource.getLastModified();
204+
Instant resourceDate = ParseUtils.parseHeaderDate(resource.getHeaders().get(HttpHeaders.DATE));
205+
String resourceETag = resource.getEtag();
206+
if (resource.getStatusCode() == 200) {
207+
if (inboundIfNoneMatch != null) {
208+
if (resourceETag != null) {
209+
String[] inboundETags = inboundIfNoneMatch.split(",");
210+
for (String inboundETag : inboundETags) {
211+
inboundETag = inboundETag.trim();
212+
if (inboundETag.equals(resourceETag)) {
213+
validInboundCache = true;
214+
break;
215+
}
216+
}
217+
}
218+
} else if (inboundIfModifiedSince != null) {
219+
if (resourceLastModified != null) {
220+
if (!inboundIfModifiedSince.isBefore(resourceLastModified)) {
221+
validInboundCache = true;
222+
}
223+
} else if (resourceDate != null) {
224+
if (!inboundIfModifiedSince.isBefore(resourceDate)) {
225+
validInboundCache = true;
226+
}
227+
}
228+
229+
}
230+
}
231+
if (validInboundCache) {
232+
MultiMap infoHeaders = MultiMap.caseInsensitiveMultiMap();
233+
List<CharSequence> headersNeeded = new ArrayList<>(List.of(
234+
HttpHeaders.CACHE_CONTROL,
235+
HttpHeaders.CONTENT_LOCATION,
236+
HttpHeaders.DATE,
237+
HttpHeaders.ETAG,
238+
HttpHeaders.EXPIRES,
239+
HttpHeaders.VARY
240+
));
241+
if (inboundIfNoneMatch == null) headersNeeded.add(HttpHeaders.LAST_MODIFIED);
242+
for (CharSequence header : headersNeeded) {
243+
String value = resource.getHeaders().get(header);
244+
if (value != null) infoHeaders.add(header, value);
245+
}
246+
ProxyResponse resp = proxyRequest.release().response();
247+
resp.headers().setAll(infoHeaders);
248+
resp.setStatusCode(304);
249+
context.set(SKIP_CACHE_RESPONSE_HANDLING, true);
250+
return Future.succeededFuture(resp);
251+
} else {
252+
proxyRequest.release();
253+
ProxyResponse proxyResponse = proxyRequest.response();
254+
resource.init(proxyResponse, inboundRequest.method() == HttpMethod.GET);
255+
context.set(SKIP_CACHE_RESPONSE_HANDLING, true);
256+
return Future.succeededFuture(proxyResponse);
257+
}
235258
}
236259

237260
});
@@ -241,11 +264,9 @@ private Future<ProxyResponse> tryHandleProxyRequestFromCache(ProxyContext contex
241264

242265
private static boolean checkVaryHeaders(MultiMap requestHeaders, MultiMap varyHeaders) {
243266
for (Map.Entry<String, String> e: varyHeaders) {
244-
String fromVary = e.getValue().toLowerCase();
267+
String fromVary = e.getValue();
245268
String fromRequest = requestHeaders.get(e.getKey());
246-
if (fromRequest == null) return false;
247-
fromRequest = fromVary.toLowerCase();
248-
if (!fromRequest.equals(fromVary)) return false;
269+
if (fromRequest == null || !fromRequest.equals(fromVary)) return false;
249270
}
250271
return true;
251272
}

‎src/main/java/io/vertx/httpproxy/impl/ProxiedResponse.java

+17-19
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,23 @@ class ProxiedResponse implements ProxyResponse {
7474
long maxAge = -1;
7575
boolean publicCacheControl = false;
7676
String cacheControlHeader = response.getHeader(HttpHeaders.CACHE_CONTROL);
77-
if (cacheControlHeader != null) {
78-
CacheControl cacheControl = new CacheControl().parse(cacheControlHeader);
79-
if (cacheControl.isPublic()) {
80-
publicCacheControl = true;
81-
if (cacheControl.sMaxage() >= 0) {
82-
maxAge = (long) cacheControl.sMaxage() * 1000;
83-
} else if (cacheControl.maxAge() >= 0) {
84-
maxAge = (long) cacheControl.maxAge() * 1000;
85-
} else {
86-
String dateHeader = response.getHeader(HttpHeaders.DATE);
87-
String expiresHeader = response.getHeader(HttpHeaders.EXPIRES);
88-
if (dateHeader != null) {
89-
if (expiresHeader != null) {
90-
maxAge = Math.max(0, ParseUtils.parseHeaderDate(expiresHeader).toEpochMilli() - ParseUtils.parseHeaderDate(dateHeader).toEpochMilli());
91-
} else if (heuristicallyCacheable(response)) {
92-
String lastModifiedHeader = response.getHeader(HttpHeaders.LAST_MODIFIED);
93-
maxAge = Math.max(0, (ParseUtils.parseHeaderDate(lastModifiedHeader).toEpochMilli() - ParseUtils.parseHeaderDate(dateHeader).toEpochMilli()) / 10);
94-
}
95-
}
77+
CacheControl cacheControl = cacheControlHeader == null ? null : new CacheControl().parse(cacheControlHeader);
78+
if (cacheControl != null && cacheControl.isPublic()) {
79+
publicCacheControl = true;
80+
}
81+
if (cacheControl != null && cacheControl.sMaxage() >= 0) {
82+
maxAge = (long) cacheControl.sMaxage() * 1000;
83+
} else if (cacheControl != null && cacheControl.maxAge() >= 0) {
84+
maxAge = (long) cacheControl.maxAge() * 1000;
85+
} else {
86+
String dateHeader = response.getHeader(HttpHeaders.DATE);
87+
String expiresHeader = response.getHeader(HttpHeaders.EXPIRES);
88+
if (dateHeader != null) {
89+
if (expiresHeader != null) {
90+
maxAge = Math.max(0, ParseUtils.parseHeaderDate(expiresHeader).toEpochMilli() - ParseUtils.parseHeaderDate(dateHeader).toEpochMilli());
91+
} else if (heuristicallyCacheable(response)) {
92+
String lastModifiedHeader = response.getHeader(HttpHeaders.LAST_MODIFIED);
93+
maxAge = Math.max(0, (ParseUtils.parseHeaderDate(lastModifiedHeader).toEpochMilli() - ParseUtils.parseHeaderDate(dateHeader).toEpochMilli()) / 10);
9694
}
9795
}
9896
}

0 commit comments

Comments
 (0)