-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12441 from jetty/jetty-12.0.x-12429-caseInsensiti…
…veHeadersWebSocket Issue #12429 - case-insensitive headers for websocket
- Loading branch information
Showing
34 changed files
with
856 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
237 changes: 237 additions & 0 deletions
237
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFieldsMap.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| // | ||
| // ======================================================================== | ||
| // Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. | ||
| // | ||
| // This program and the accompanying materials are made available under the | ||
| // terms of the Eclipse Public License v. 2.0 which is available at | ||
| // https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| // which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| // | ||
| // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| // ======================================================================== | ||
| // | ||
|
|
||
| package org.eclipse.jetty.http; | ||
|
|
||
| import java.util.AbstractMap; | ||
| import java.util.AbstractSet; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.eclipse.jetty.util.StringUtil; | ||
|
|
||
| /** | ||
| * <p>A {@link java.util.Map} which is backed by an instance of {@link HttpFields.Mutable}.</p> | ||
| * @see HttpFieldsMap.Mutable | ||
| * @see HttpFieldsMap.Immutable | ||
| */ | ||
| abstract class HttpFieldsMap extends AbstractMap<String, List<String>> | ||
| { | ||
| /** | ||
| * <p>A {@link java.util.Map} which is backed by an instance of {@link HttpFields.Mutable}.</p> | ||
| * <p>Any changes to the {@link java.util.Map} will be reflected in the underlying instance of {@link HttpFields.Mutable}.</p> | ||
| */ | ||
| public static class Mutable extends HttpFieldsMap | ||
| { | ||
| private final HttpFields.Mutable httpFields; | ||
|
|
||
| public Mutable(HttpFields.Mutable httpFields) | ||
| { | ||
| this.httpFields = httpFields; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> get(Object key) | ||
| { | ||
| if (key instanceof String s) | ||
| return httpFields.getValuesList(s); | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> put(String key, List<String> value) | ||
| { | ||
| List<String> oldValue = get(key); | ||
| httpFields.put(key, value); | ||
| return oldValue; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> remove(Object key) | ||
| { | ||
| if (key instanceof String s) | ||
| { | ||
| List<String> oldValue = get(s); | ||
| httpFields.remove(s); | ||
| return oldValue; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Entry<String, List<String>>> entrySet() | ||
| { | ||
| return new AbstractSet<>() | ||
| { | ||
| @Override | ||
| public Iterator<Entry<String, List<String>>> iterator() | ||
| { | ||
| return new Iterator<>() | ||
| { | ||
| private final Iterator<String> iterator = httpFields.getFieldNamesCollection().iterator(); | ||
| private String name = null; | ||
|
|
||
| @Override | ||
| public boolean hasNext() | ||
| { | ||
| return iterator.hasNext(); | ||
| } | ||
|
|
||
| @Override | ||
| public Entry<String, List<String>> next() | ||
| { | ||
| name = iterator.next(); | ||
| return new HttpFieldsEntry(name); | ||
| } | ||
|
|
||
| @Override | ||
| public void remove() | ||
| { | ||
| if (name != null) | ||
| { | ||
| Mutable.this.remove(name); | ||
| name = null; | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public int size() | ||
| { | ||
| return httpFields.getFieldNamesCollection().size(); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * <p>A {@link java.util.Map} which is backed by an instance of {@link HttpFields.Mutable}.</p> | ||
| * <p>Any attempt to modify the map will throw {@link UnsupportedOperationException}.</p> | ||
| */ | ||
| public static class Immutable extends HttpFieldsMap | ||
| { | ||
| private final HttpFields httpFields; | ||
|
|
||
| public Immutable(HttpFields httpFields) | ||
| { | ||
| this.httpFields = httpFields; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> get(Object key) | ||
| { | ||
| if (key instanceof String s) | ||
| return httpFields.getValuesList(s); | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> put(String key, List<String> value) | ||
| { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> remove(Object key) | ||
| { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Entry<String, List<String>>> entrySet() | ||
| { | ||
| return new AbstractSet<>() | ||
| { | ||
| @Override | ||
| public Iterator<Entry<String, List<String>>> iterator() | ||
| { | ||
| return new Iterator<>() | ||
| { | ||
| private final Iterator<String> iterator = httpFields.getFieldNamesCollection().iterator(); | ||
|
|
||
| @Override | ||
| public boolean hasNext() | ||
| { | ||
| return iterator.hasNext(); | ||
| } | ||
|
|
||
| @Override | ||
| public Entry<String, List<String>> next() | ||
| { | ||
| return new HttpFieldsEntry(iterator.next()); | ||
| } | ||
|
|
||
| @Override | ||
| public void remove() | ||
| { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public int size() | ||
| { | ||
| return httpFields.getFieldNamesCollection().size(); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| private class HttpFieldsEntry implements Entry<String, List<String>> | ||
| { | ||
| private final String _name; | ||
|
|
||
| public HttpFieldsEntry(String name) | ||
| { | ||
| _name = name; | ||
| } | ||
|
|
||
| @Override | ||
| public String getKey() | ||
| { | ||
| return _name; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getValue() | ||
| { | ||
| return HttpFieldsMap.this.get(_name); | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> setValue(List<String> value) | ||
| { | ||
| return HttpFieldsMap.this.put(_name, value); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) | ||
| return true; | ||
| if (o instanceof HttpFieldsEntry other) | ||
| return StringUtil.asciiEqualsIgnoreCase(_name, other.getKey()); | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(StringUtil.asciiToLowerCase(_name)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.