Skip to content

Handle multiple headers with the same name #23

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 2 commits into
base: main
Choose a base branch
from
Open

Handle multiple headers with the same name #23

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
5f2139a
Remove pointless overrides
Mahoney Jan 16, 2025
9c94e5f
Handle multiple headers with the same name
Mahoney Jan 16, 2025
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
27 changes: 27 additions & 0 deletions logback-access-jetty12/src/main/java/ch/qos/logback/access/jetty/HeaderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package ch.qos.logback.access.jetty;

import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;

import java.util.Map;
import java.util.TreeMap;

class HeaderUtil {
static Map<String, String> buildHeaderMap(HttpFields headers) {
Map<String, String> requestHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (HttpField f : headers) {
String existing = requestHeaderMap.get(f.getName());
String value = combine(existing, f.getValue());
requestHeaderMap.put(f.getName(), value);
}
return requestHeaderMap;
}

private static String combine(String existing, String field) {
if (existing == null) {
return field;
} else {
return existing + "," + field;
}
}
}
41 changes: 0 additions & 41 deletions ...ck-access-jetty12/src/main/java/ch/qos/logback/access/jetty/JettyModernServerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@
*/
package ch.qos.logback.access.jetty;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import ch.qos.logback.access.common.spi.ServerAdapter;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;

Expand All @@ -31,42 +25,7 @@
* @author Joakim Erdfelt
*/
public class JettyModernServerAdapter extends JettyServerAdapter {


public JettyModernServerAdapter(Request jettyRequest, Response jettyResponse) {
super(jettyRequest, jettyResponse);
}

@Override
public long getContentLength() {

return Response.getContentBytesWritten(response);
//return response.getHttpChannel().getBytesWritten();
}

@Override
public int getStatusCode() {
return response.getStatus();
//return response.getCommittedMetaData().getStatus();
}

@Override
public long getRequestTimestamp() {
return Request.getTimeStamp(request);
}

@Override
public Map<String, String> buildResponseHeaderMap() {
Map<String, String> responseHeaderMap = new HashMap<>();
HttpFields.Mutable httpFields = response.getHeaders();

for(HttpField field: httpFields) {
String key = field.getName();
String value = field.getValue();
responseHeaderMap.put(key, value);
}

return responseHeaderMap;
}

}
18 changes: 3 additions & 15 deletions logback-access-jetty12/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,13 @@
package ch.qos.logback.access.jetty;

import ch.qos.logback.access.common.spi.ServerAdapter;

import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;

import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;

import static ch.qos.logback.access.jetty.HeaderUtil.buildHeaderMap;

/**
* A jetty specific implementation of the {@link ServerAdapter} interface.
*
Expand Down Expand Up @@ -57,16 +54,7 @@ public long getRequestTimestamp() {

@Override
public Map<String, String> buildResponseHeaderMap() {
Map<String, String> responseHeaderMap = new HashMap<String, String>();
HttpFields.Mutable httpFields = response.getHeaders();

for(HttpField field: httpFields) {
String key = field.getName();
String value = field.getValue();
responseHeaderMap.put(key, value);
}

return responseHeaderMap;
return buildHeaderMap(response.getHeaders());
}

}
10 changes: 2 additions & 8 deletions logback-access-jetty12/src/main/java/ch/qos/logback/access/jetty/RequestWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
import org.eclipse.jetty.http.HttpCookie;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Session;
Expand All @@ -37,10 +35,10 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;

import static ch.qos.logback.access.common.spi.IAccessEvent.NA;
import static ch.qos.logback.access.jetty.HeaderUtil.buildHeaderMap;
import static java.nio.charset.StandardCharsets.UTF_8;

public class RequestWrapper implements HttpServletRequest, WrappedHttpRequest {
Expand Down Expand Up @@ -92,11 +90,7 @@ public Enumeration<String> getHeaderNames() {

@Override
public Map<String, String> buildRequestHeaderMap() {
Map<String, String> requestHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (HttpField f : request.getHeaders()) {
requestHeaderMap.put(f.getName(), f.getValue());
}
return requestHeaderMap;
return buildHeaderMap(request.getHeaders());
}

@Override
Expand Down