narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

parse invalid jingle actions

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-30 08:48:09 +01:00
parent 14fb903522
commit c527e76337
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View file

@ -76,15 +76,20 @@ public class JingleConnectionManager extends AbstractConnectionManager {
public void deliverPacket(final Account account, final JinglePacket packet) {
final String sessionId = packet.getSessionId();
final JinglePacket.Action action = packet.getAction();
if (sessionId == null) {
respondWithJingleError(account, packet, "unknown-session", "item-not-found", "cancel");
return;
}
if (action == null) {
respondWithJingleError(account, packet, null, "bad-request", "cancel");
return;
}
final AbstractJingleConnection.Id id = AbstractJingleConnection.Id.of(account, packet);
final AbstractJingleConnection existingJingleConnection = connections.get(id);
if (existingJingleConnection != null) {
existingJingleConnection.deliverPacket(packet);
} else if (packet.getAction() == JinglePacket.Action.SESSION_INITIATE) {
} else if (action == JinglePacket.Action.SESSION_INITIATE) {
final Jid from = packet.getFrom();
final Content content = packet.getJingleContent();
final String descriptionNamespace =
@ -153,7 +158,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
rtpConnection.integrationFailure();
}
private void sendSessionTerminate(final Account account, final IqPacket request, final AbstractJingleConnection.Id id) {
private void sendSessionTerminate(
final Account account, final IqPacket request, final AbstractJingleConnection.Id id) {
mXmppConnectionService.sendIqPacket(
account, request.generateResponse(IqPacket.TYPE.RESULT), null);
final JinglePacket sessionTermination =
@ -255,9 +261,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
void respondWithJingleError(
final Account account,
final IqPacket original,
String jingleCondition,
String condition,
String conditionType) {
final String jingleCondition,
final String condition,
final String conditionType) {
final IqPacket response = original.generateResponse(IqPacket.TYPE.ERROR);
final Element error = response.addChild("error");
error.setAttribute("type", conditionType);
@ -1171,8 +1177,6 @@ public class JingleConnectionManager extends AbstractConnectionManager {
public void onCallIntegrationAnswer() {}
@Override
public void onCallIntegrationSilence() {
}
public void onCallIntegrationSilence() {}
}
}

11
src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
View file

@ -142,8 +142,15 @@ public class JinglePacket extends IqPacket {
TRANSPORT_REPLACE;
public static Action of(final String value) {
// TODO handle invalid
return Action.valueOf(CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, value));
if (Strings.isNullOrEmpty(value)) {
return null;
}
try {
return Action.valueOf(
CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, value));
} catch (final IllegalArgumentException e) {
return null;
}
}
@Override