demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Zepp OS: Fix index overflow on large file transfers

Browse Source
This commit is contained in:
José Rebelo
2025-03-23 18:06:30 +00:00
parent a615807945
commit c33b0ffcbb
5 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFileTransferService.java
+8 -8
View File
@@ -24,16 +24,16 @@ import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.filetransfer.AbstractFileTransferImpl;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.filetransfer.FileTransferImplV2;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.filetransfer.FileTransferImplV3;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.filetransfer.ZeppOsFileTransferImpl;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.filetransfer.ZeppOsFileTransferV2;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.filetransfer.ZeppOsFileTransferV3;
public class ZeppOsFileTransferService extends AbstractZeppOsService {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFileTransferService.class);
private static final short ENDPOINT = 0x000d;
private AbstractFileTransferImpl impl;
private ZeppOsFileTransferImpl impl;
public ZeppOsFileTransferService(final ZeppOsSupport support) {
super(support, false);
@@ -59,15 +59,15 @@ public class ZeppOsFileTransferService extends AbstractZeppOsService {
return;
}
if (payload[0] != AbstractFileTransferImpl.CMD_CAPABILITIES_RESPONSE) {
if (payload[0] != ZeppOsFileTransferImpl.CMD_CAPABILITIES_RESPONSE) {
LOG.warn("Got file transfer command, but impl is not initialized");
return;
}
final int version = payload[1] & 0xff;
if (version == 1 || version == 2) {
impl = new FileTransferImplV2(this, getSupport());
impl = new ZeppOsFileTransferV2(this, getSupport());
} else if (version == 3) {
impl = new FileTransferImplV3(this, getSupport());
impl = new ZeppOsFileTransferV3(this, getSupport());
} else {
LOG.error("Unsupported file transfer service version: {}", version);
return;
@@ -78,7 +78,7 @@ public class ZeppOsFileTransferService extends AbstractZeppOsService {
@Override
public void initialize(final TransactionBuilder builder) {
write(builder, new byte[]{AbstractFileTransferImpl.CMD_CAPABILITIES_REQUEST});
write(builder, new byte[]{ZeppOsFileTransferImpl.CMD_CAPABILITIES_REQUEST});
}
public void sendFile(final String url, final String filename, final byte[] bytes, final boolean compress, final Callback callback) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/FileTransferRequest.java
+5 -5
View File
@@ -21,7 +21,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.service
/**
* Wrapper class to keep track of ongoing file send requests and their progress.
*/
public class FileTransferRequest {
class FileTransferRequest {
private final String url;
private final String filename;
private final int rawLength;
@@ -32,7 +32,7 @@ public class FileTransferRequest {
private final ZeppOsFileTransferService.Callback callback;
private int progress = 0;
private byte index = 0;
private int index = 0;
public FileTransferRequest(final String url,
final String filename,
@@ -96,11 +96,11 @@ public class FileTransferRequest {
this.progress = progress;
}
public byte getIndex() {
public int getIndex() {
return index;
}
public void setIndex(final byte index) {
this.index = index;
public void setIndex(final int index) {
this.index = index & 0xff;
}
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/AbstractFileTransferImpl.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/ZeppOsFileTransferImpl.java
+4 -4
View File
@@ -23,8 +23,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.service
import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
public abstract class AbstractFileTransferImpl {
private static final Logger LOG = LoggerFactory.getLogger(AbstractFileTransferImpl.class);
public abstract class ZeppOsFileTransferImpl {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFileTransferImpl.class);
public static final byte CMD_CAPABILITIES_REQUEST = 0x01;
public static final byte CMD_CAPABILITIES_RESPONSE = 0x02;
@@ -47,8 +47,8 @@ public abstract class AbstractFileTransferImpl {
protected int mCompressedChunkSize = -1;
protected final List<String> supportedServices = new ArrayList<>();
public AbstractFileTransferImpl(final ZeppOsFileTransferService fileTransferService,
final ZeppOsSupport support) {
public ZeppOsFileTransferImpl(final ZeppOsFileTransferService fileTransferService,
final ZeppOsSupport support) {
this.mFileTransferService = fileTransferService;
this.mSupport = support;
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/FileTransferImplV2.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/ZeppOsFileTransferV2.java
+7 -7
View File
@@ -33,13 +33,13 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsS
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsFileTransferService;
import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
public class FileTransferImplV2 extends AbstractFileTransferImpl {
private static final Logger LOG = LoggerFactory.getLogger(FileTransferImplV2.class);
public class ZeppOsFileTransferV2 extends ZeppOsFileTransferImpl {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFileTransferV2.class);
private final Map<Byte, FileTransferRequest> mSessionRequests = new HashMap<>();
public FileTransferImplV2(final ZeppOsFileTransferService fileTransferService,
final ZeppOsSupport support) {
public ZeppOsFileTransferV2(final ZeppOsFileTransferService fileTransferService,
final ZeppOsSupport support) {
super(fileTransferService, support);
}
@@ -171,7 +171,7 @@ public class FileTransferImplV2 extends AbstractFileTransferImpl {
}
buf.get(request.getBytes(), request.getProgress(), size);
request.setIndex((byte) (index + 1));
request.setIndex(index + 1);
request.setProgress(request.getProgress() + size);
LOG.debug("Got data for session={}, progress={}/{}", session, request.getProgress(), request.getSize());
@@ -247,7 +247,7 @@ public class FileTransferImplV2 extends AbstractFileTransferImpl {
buf.put(flags);
buf.put(session);
buf.put(request.getIndex());
buf.put((byte) request.getIndex());
if ((flags & FLAG_FIRST_CHUNK) > 0) {
buf.put((byte) 0x00); // ?
buf.put((byte) 0x00); // ?
@@ -265,7 +265,7 @@ public class FileTransferImplV2 extends AbstractFileTransferImpl {
buf.put(payload);
request.setProgress(request.getProgress() + payload.length);
request.setIndex((byte) (request.getIndex() + 1));
request.setIndex(request.getIndex() + 1);
request.getCallback().onFileUploadProgress(request.getProgress());
mFileTransferService.write("send file data", buf.array());
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/FileTransferImplV3.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/ZeppOsFileTransferV3.java
+6 -6
View File
@@ -36,8 +36,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsS
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsFileTransferService;
import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
public class FileTransferImplV3 extends AbstractFileTransferImpl {
private static final Logger LOG = LoggerFactory.getLogger(FileTransferImplV3.class);
public class ZeppOsFileTransferV3 extends ZeppOsFileTransferImpl {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFileTransferV3.class);
private static final byte CMD_DATA_V3_SEND = 0x12;
private static final byte CMD_DATA_V3_ACK = 0x13;
@@ -58,8 +58,8 @@ public class FileTransferImplV3 extends AbstractFileTransferImpl {
private boolean currentReceiveChunkIsLast = false;
private final ByteArrayOutputStream receivePacketBuffer = new ByteArrayOutputStream();
public FileTransferImplV3(final ZeppOsFileTransferService fileTransferService,
final ZeppOsSupport support) {
public ZeppOsFileTransferV3(final ZeppOsFileTransferService fileTransferService,
final ZeppOsSupport support) {
super(fileTransferService, support);
}
@@ -193,7 +193,7 @@ public class FileTransferImplV3 extends AbstractFileTransferImpl {
}
final byte status = value[1];
final byte chunkIndex = value[2];
final int chunkIndex = value[2] & 0xff;
final byte unk1 = value[3]; // 1/2?
LOG.info(
@@ -248,7 +248,7 @@ public class FileTransferImplV3 extends AbstractFileTransferImpl {
buf.order(ByteOrder.LITTLE_ENDIAN);
buf.put(CMD_DATA_V3_SEND);
buf.put(flags);
buf.put(request.getIndex());
buf.put((byte) request.getIndex());
buf.putShort((short) chunk.length);
buf.put(chunk);