Skip to content
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

Jump to bottom

Add support of SameSite to WOCookie #790

Merged
merged 3 commits into from
Aug 8, 2016
Merged

Add support of SameSite to WOCookie #790

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c8f96c
add SameSite support to cookies
darkv Aug 2, 2016
69a67e2
cleanup
darkv Aug 2, 2016
fa4bfeb
change serialVersionUID as we added to serialization
darkv Aug 2, 2016
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
52 changes: 40 additions & 12 deletions Frameworks/Core/ERExtensions/Sources/com/webobjects/appserver/WOCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
import com.webobjects.foundation.NSTimeZone;
import com.webobjects.foundation.NSTimestamp;

public class WOCookie implements NSKeyValueCoding, com.webobjects.foundation.NSKeyValueCoding.ErrorHandling,
public class WOCookie implements NSKeyValueCoding, NSKeyValueCoding.ErrorHandling,
NSKeyValueCodingAdditions, Serializable {

static final long serialVersionUID = 310727495L;
static final long serialVersionUID = 1L;
String _name;
String _value;
String _domain;
Expand All @@ -25,6 +25,7 @@ public class WOCookie implements NSKeyValueCoding, com.webobjects.foundation.NSK
NSTimestamp _expires;
int _timeout;
boolean _isHttpOnly;
SameSite _sameSite;
@Deprecated
static final SimpleDateFormat TheDateFormat;

Expand Down Expand Up @@ -80,8 +81,8 @@ public WOCookie(final String name, final String value, final String path, final
_expires = expires;
_isSecure = isSecure;
_isHttpOnly = httpOnly;
_sameSite = SameSite.NORMAL;
setTimeOut(-1);
return;
}

public WOCookie(final String name, final String value, final String path, final String domain, final int timeout,
Expand All @@ -101,7 +102,7 @@ public WOCookie(final String name, final String value, final String path, final
setTimeOut(timeout);
_isSecure = isSecure;
_isHttpOnly = httpOnly;
return;
_sameSite = SameSite.NORMAL;
}

public WOCookie(final String name, final String value) {
Expand All @@ -113,11 +114,13 @@ public String toString() {
String expiresString = _expires != null ? new StringBuilder().append(" expires=")
.append(TIMESTAMP_FORMATTER.get().format(_expires)).toString() : "";
String expires = _timeout < 0 ? "" : new StringBuilder().append(" max-age=").append(_timeout).toString();
String sameSite = _sameSite == SameSite.NORMAL ? "" :
new StringBuilder().append(" SameSite=").append(_sameSite.toString().toLowerCase()).toString();

return new StringBuilder().append('<').append(getClass().getName()).append(" name=").append(_name)
.append(" value=").append(_value).append(" path=").append(_path).append(" domain=").append(_domain)
.append(expiresString).append(expires).append(" isSecure=").append(_isSecure)
.append(" isHttpOnly=").append(_isHttpOnly).append('>').toString();
.append(" isHttpOnly=").append(_isHttpOnly).append(sameSite).append('>').toString();
}

public String headerString() {
Expand Down Expand Up @@ -168,6 +171,10 @@ String _headerString(final boolean isRequest) {
if (_isHttpOnly) {
header.append("; HttpOnly");
}
if (_sameSite != SameSite.NORMAL) {
header.append("; SameSite=");
header.append(_sameSite.toString().toLowerCase());
}
}
return header.toString();
}
Expand Down Expand Up @@ -236,36 +243,44 @@ public void setIsHttpOnly(final boolean isHttpOnly) {
_isHttpOnly = isHttpOnly;
}

public SameSite sameSite() {
return _sameSite;
}

public void setSameSite(final SameSite sameSite) {
_sameSite = sameSite;
}

public static boolean canAccessFieldsDirectly() {
return true;
}

public Object valueForKey(final String key) {
return com.webobjects.foundation.NSKeyValueCoding.DefaultImplementation.valueForKey(this, key);
return NSKeyValueCoding.DefaultImplementation.valueForKey(this, key);
}

public void takeValueForKey(final Object value, final String key) {
com.webobjects.foundation.NSKeyValueCoding.DefaultImplementation.takeValueForKey(this, value, key);
NSKeyValueCoding.DefaultImplementation.takeValueForKey(this, value, key);
}

public Object handleQueryWithUnboundKey(final String key) {
return com.webobjects.foundation.NSKeyValueCoding.DefaultImplementation.handleQueryWithUnboundKey(this, key);
return NSKeyValueCoding.DefaultImplementation.handleQueryWithUnboundKey(this, key);
}

public void handleTakeValueForUnboundKey(final Object value, final String key) {
com.webobjects.foundation.NSKeyValueCoding.DefaultImplementation.handleTakeValueForUnboundKey(this, value, key);
NSKeyValueCoding.DefaultImplementation.handleTakeValueForUnboundKey(this, value, key);
}

public void unableToSetNullForKey(final String key) {
com.webobjects.foundation.NSKeyValueCoding.DefaultImplementation.unableToSetNullForKey(this, key);
NSKeyValueCoding.DefaultImplementation.unableToSetNullForKey(this, key);
}

public Object valueForKeyPath(final String key) {
return com.webobjects.foundation.NSKeyValueCodingAdditions.DefaultImplementation.valueForKeyPath(this, key);
return NSKeyValueCodingAdditions.DefaultImplementation.valueForKeyPath(this, key);
}

public void takeValueForKeyPath(final Object value, final String key) {
com.webobjects.foundation.NSKeyValueCodingAdditions.DefaultImplementation.takeValueForKeyPath(this, value, key);
NSKeyValueCodingAdditions.DefaultImplementation.takeValueForKeyPath(this, value, key);
}

private void writeObject(final ObjectOutputStream out) throws IOException {
Expand All @@ -277,6 +292,7 @@ private void writeObject(final ObjectOutputStream out) throws IOException {
out.writeBoolean(_isSecure);
out.writeObject(_expires);
out.writeBoolean(_isHttpOnly);
out.writeObject(_sameSite);
}

private void readObject(final ObjectInputStream out) throws IOException, ClassNotFoundException {
Expand All @@ -288,5 +304,17 @@ private void readObject(final ObjectInputStream out) throws IOException, ClassNo
_isSecure = out.readBoolean();
_expires = (NSTimestamp) out.readObject();
_isHttpOnly = out.readBoolean();
_sameSite = (SameSite) out.readObject();
}

/**
* Possible values for same-site cookie setting.
*
* @see <a href="https://tools.ietf.org/html/draft-west-first-party-cookies-07">RFC draft</a>
*/
public static enum SameSite {
NORMAL,
LAX,
STRICT
}
}