dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-07-28 20:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

SAM: Accept fixes (Gitlab #399)

Browse Source
This commit is contained in:
zzz
2023-09-29 09:57:12 +00:00
parent a343f781d0
commit 0ba97ed4cd
4 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
+7
View File
@@ -361,6 +361,13 @@ class SAMStreamSession implements SAMMessageSess {
socketMgr.destroySocketManager();
}
/**
* Is the underlying streaming socket manager destroyed?
*
* @since 0.9.60
*/
public boolean isDestroyed() { return socketMgr.isDestroyed(); }
/**
* Close a connection managed by the SAM STREAM session.
*
apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
+45 -3
View File
@@ -29,6 +29,7 @@ import net.i2p.I2PException;
import net.i2p.client.I2PClient;
import net.i2p.client.I2PSession;
import net.i2p.client.I2PSessionException;
import net.i2p.client.streaming.RouterRestartException;
import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
import net.i2p.data.DataFormatException;
@@ -718,7 +719,8 @@ class SAMv3Handler extends SAMv1Handler
return false ;
}
streamSession = rec.getHandler().streamSession ;
SAMv3Handler ctl = rec.getHandler();
streamSession = ctl.streamSession;
if (streamSession==null) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("specified ID is not a stream session");
@@ -727,6 +729,16 @@ class SAMv3Handler extends SAMv1Handler
} catch (IOException e) {}
return false ;
}
if (streamSession.isDestroyed()) {
if (_log.shouldDebug())
_log.debug("Session manager is destroyed");
try {
notifyStreamResult(true, "I2P_ERROR", "Session is closed");
} catch (IOException e) {}
ctl.writeString(SESSION_ERROR, "Session is closed");
ctl.stopHandling();
return false;
}
if ( opcode.equals ( "CONNECT" ) )
{
@@ -734,7 +746,17 @@ class SAMv3Handler extends SAMv1Handler
}
else if ( opcode.equals ( "ACCEPT" ) )
{
return execStreamAccept ( props );
try {
return execStreamAccept(props);
} catch (I2PSessionException ise) {
ctl.writeString(SESSION_ERROR, ise.getMessage());
ctl.stopHandling();
return false;
} catch (RouterRestartException rre) {
ctl.writeString(SESSION_ERROR, "Router restart");
ctl.stopHandling();
return false;
}
}
else if ( opcode.equals ( "FORWARD") )
{
@@ -822,13 +844,18 @@ class SAMv3Handler extends SAMv1Handler
return false ;
}
private boolean execStreamAccept( Properties props )
/**
* @return success
* @throws I2PSessionException if socket manager is destroyed while waiting
*/
private boolean execStreamAccept(Properties props) throws I2PSessionException, RouterRestartException
{
// Messages are NOT sent if SILENT=true,
// The specs said that they were.
boolean verbose = !Boolean.parseBoolean(props.getProperty("SILENT"));
try {
try {
// execStreamSession() above checks if session is destroyed first
notifyStreamResult(verbose, "OK", null);
((SAMv3StreamSession)streamSession).accept(this, verbose);
return true ;
@@ -836,6 +863,21 @@ class SAMv3Handler extends SAMv1Handler
if (_log.shouldLog(Log.DEBUG))
_log.debug("STREAM ACCEPT failed", e);
notifyStreamResult( verbose, "TIMEOUT", e.getMessage() );
} catch (I2PSessionException e) {
// As of 0.9.60, this is thrown for a destroyed session.
// Kill the SAM session.
if (_log.shouldDebug())
_log.debug("STREAM ACCEPT failed", e);
notifyStreamResult (verbose, "I2P_ERROR", e.getMessage());
// throw so caller can close control socket
throw e;
} catch (RouterRestartException e) {
// Kill the SAM session.
if (_log.shouldDebug())
_log.debug("STREAM ACCEPT failed", e);
notifyStreamResult (verbose, "I2P_ERROR", "Router restart");
// throw so caller can close control socket
throw e;
} catch (I2PException e) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("STREAM ACCEPT failed", e);