Changeset e8025f0


Ignore:
Timestamp:
Apr 23, 2013 7:27:52 PM (8 years ago)
Author:
zab2 <zab2@…>
Branches:
master
Children:
ec4f2d2
Parents:
5fd63c12 (diff), aa547a16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '3c164e606c1ed364a6caf2b5b77abbdf819a2bc7'

and 'ebe0842bec96b1e0ed3b8e0c18d4ea05ba7cb981'

Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java

    r5fd63c12 re8025f0  
    194194                                    // save for compress decision on server side
    195195                                    _contentType = val;
     196                                } else if ("set-cookie".equals(lcKey)) {
     197                                    String lcVal = val.toLowerCase(Locale.US);
     198                                    if (lcVal.contains("domain=b32.i2p") ||
     199                                        lcVal.contains("domain=.b32.i2p")) {
     200                                        // Strip privacy-damaging "supercookie" for b32.i2p
     201                                        // Let's presume the user agent ignores a cookie for "i2p"
     202                                        // See RFC 6265 and http://publicsuffix.org/
     203                                        if (_log.shouldLog(Log.INFO))
     204                                            _log.info("Stripping \"" + key + ": " + val + "\" from response ");
     205                                        break;
     206                                    }
    196207                                }
    197208                                out.write((key.trim() + ": " + val.trim() + "\r\n").getBytes());
  • apps/jetty/build.xml

    r5fd63c12 re8025f0  
    203203                <pathelement location="./jettylib/jetty-http.jar" />
    204204                <pathelement location="./jettylib/jetty-io.jar" />
     205                <pathelement location="./jettylib/jetty-security.jar" />
    205206                <pathelement location="./jettylib/jetty-util.jar" />
    206207                <pathelement location="./jettylib/jetty-xml.jar" />
     
    217218            destdir="./build/obj"
    218219            includeAntRuntime="false"
    219             classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
     220            classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
    220221            <compilerarg line="${javac.compilerargs}" />
    221222        </javac>
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    r5fd63c12 re8025f0  
    3030import net.i2p.data.Base32;
    3131import net.i2p.data.DataHelper;
     32import net.i2p.jetty.I2PDigestAuthenticator;
    3233import net.i2p.jetty.I2PLogger;
    3334import net.i2p.router.RouterContext;
     
    106107
    107108    // Jetty Auth
    108     private static final DigestAuthenticator authenticator = new DigestAuthenticator();
     109    private static final DigestAuthenticator authenticator = new I2PDigestAuthenticator();
     110    static {
     111        // default changed from 0 (forever) in Jetty 6 to 60*1000 ms in Jetty 7
     112        authenticator.setMaxNonceAge(7*24*60*60*1000L);
     113    }
    109114    public static final String JETTY_REALM = "i2prouter";
    110115    private static final String JETTY_ROLE = "routerAdmin";
  • history.txt

    r5fd63c12 re8025f0  
     12013-04-23 zzz
     2 * Console: Fix Jetty digest auth bug causing repeated password requests
     3 * i2ptunnel: Block b32.i2p supercookies
     4
    152013-04-21 zzz
    26 * AppManager: Add HTML debug output
  • router/java/src/net/i2p/router/RouterVersion.java

    r5fd63c12 re8025f0  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 12;
     21    public final static long BUILD = 13;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.