PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-12-01 16:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Repurposed ThreadDownloadImageEtag to be able to add client cache encryption

Browse source
This commit is contained in:
PolyacovYury 2018-09-07 14:05:32 +03:00
parent f4a3d93d23
commit 80478603f4
2 changed files with 37 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
View file

@ -23,6 +23,7 @@ import com.voxelmodpack.hdskins.gui.GuiSkins;
import com.voxelmodpack.hdskins.resources.SkinResourceManager;
import com.voxelmodpack.hdskins.resources.TextureLoader;
import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
import com.voxelmodpack.hdskins.resources.texture.ThreadDownloadImageEncrypt;
import com.voxelmodpack.hdskins.server.BethlehemSkinServer;
import com.voxelmodpack.hdskins.server.LegacySkinServer;
import com.voxelmodpack.hdskins.server.ServerType;
@ -35,7 +36,6 @@ import com.voxelmodpack.hdskins.util.ProfileTextureUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.client.renderer.ThreadDownloadImageData;
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.client.resources.IResourceManager;
@ -188,7 +188,7 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
} else {
// schedule texture loading on the main thread.
TextureLoader.loadTexture(resource, new ThreadDownloadImageData(
TextureLoader.loadTexture(resource, new ThreadDownloadImageEncrypt(
new File(LiteLoader.getAssetsDirectory(), "hd/" + skinDir + texture.getHash().substring(0, 2) + "/" + texture.getHash()),
texture.getUrl(),
DefaultPlayerSkin.getDefaultSkinLegacy(),

88
src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java → src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageEncrypt.java
View file

@ -6,9 +6,8 @@ import net.minecraft.client.renderer.texture.SimpleTexture;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@ -19,22 +18,21 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.imageio.ImageIO;
/**
* @deprecated Now that legacy includes the etag in the hash, it is no longer required to save it to disk.
* even if legacy has the etag in the hash - we still need our client cache encryption
*/
@Deprecated
public class ThreadDownloadImageETag extends SimpleTexture implements IBufferedTexture {
public class ThreadDownloadImageEncrypt extends SimpleTexture implements IBufferedTexture {
private static final Logger LOGGER = LogManager.getLogger();
private static final AtomicInteger THREAD_ID = new AtomicInteger(0);
@ -42,7 +40,6 @@ public class ThreadDownloadImageETag extends SimpleTexture implements IBufferedT
@Nonnull
private final Path cacheFile;
private final Path eTagFile;
private final String imageUrl;
@Nullable
private final IImageBuffer imageBuffer;
@ -53,10 +50,9 @@ public class ThreadDownloadImageETag extends SimpleTexture implements IBufferedT
private Thread imageThread;
private boolean textureUploaded;
public ThreadDownloadImageETag(@Nonnull File cacheFileIn, String imageUrlIn, ResourceLocation defLocation, @Nullable IImageBuffer imageBufferIn) {
public ThreadDownloadImageEncrypt(@Nonnull File cacheFileIn, String imageUrlIn, ResourceLocation defLocation, @Nullable IImageBuffer imageBufferIn) {
super(defLocation);
this.cacheFile = cacheFileIn.toPath();
this.eTagFile = cacheFile.resolveSibling(cacheFile.getFileName() + ".etag");
this.imageUrl = imageUrlIn;
this.imageBuffer = imageBufferIn;
}
@ -116,36 +112,40 @@ public class ThreadDownloadImageETag extends SimpleTexture implements IBufferedT
case NOPE:
LOGGER.debug("Loading http texture from local cache ({})", cacheFile);
try {
// e-tag check passed. Load the local file
setLocalCache();
break;
if (setLocalCache()) {// since setLocalCache doesn't throw anything - had to make it return a result
break;
}
} catch (IOException e) {
// Nope. Local cache is corrupt. Re-download it.
// fallthrough to load from network
LOGGER.error("Couldn't load skin {}", cacheFile, e);
}
case OUTDATED:
loadTextureFromServer();
}
}
private void setLocalCache() throws IOException {
private boolean setLocalCache() throws IOException {
if (Files.isRegularFile(cacheFile)) {
try (InputStream in = Files.newInputStream(cacheFile)) {
BufferedImage image = ImageIO.read(in);
if (imageBuffer != null) {
image = imageBuffer.parseUserSkin(image);
}
setBufferedImage(image);
byte[] fileBytes = FileUtils.readFileToByteArray(cacheFile.toFile());
// decryption placeholder
byte[] imageBytes = new byte[fileBytes.length];
System.arraycopy(fileBytes, 0, imageBytes, 0, imageBytes.length);
// end decryption placeholder
InputStream in = new ByteArrayInputStream(imageBytes);
BufferedImage image = ImageIO.read(in);
if (imageBuffer != null) {
image = imageBuffer.parseUserSkin(image);
}
setBufferedImage(image);
return true;
}
return false;
}
private void clearCache() {
try {
Files.deleteIfExists(this.cacheFile);
Files.deleteIfExists(this.eTagFile);
} catch (IOException e) {
// ignore
}
@ -167,50 +167,32 @@ public class ThreadDownloadImageETag extends SimpleTexture implements IBufferedT
if (code != HttpStatus.SC_OK) {
return State.NOPE;
}
return checkETag(response) ? State.OK : State.OUTDATED;
return State.OK;
} catch (IOException e) {
LOGGER.error("Couldn't load skin {} ", imageUrl, e);
return State.NOPE;
}
}
private boolean checkETag(HttpResponse response) {
try {
if (Files.isRegularFile(cacheFile)) {
String localETag = Files.lines(eTagFile).limit(1).findFirst().orElse("");
Header remoteETag = response.getFirstHeader(HttpHeaders.ETAG);
// true if no remote etag or does match
return remoteETag == null || localETag.equals(remoteETag.getValue());
}
return false;
} catch (IOException e) {
// it failed, so re-fetch.
return false;
}
}
private void loadTextureFromServer() {
LOGGER.debug("Downloading http texture from {} to {}", imageUrl, cacheFile);
try (MoreHttpResponses resp = MoreHttpResponses.execute(client, new HttpGet(imageUrl))) {
if (resp.ok()) {
// write the image to disk
Files.createDirectories(cacheFile.getParent());
Files.copy(resp.getInputStream(), cacheFile);
try (InputStream in = Files.newInputStream(cacheFile)) {
BufferedImage bufferedimage = ImageIO.read(in);
// maybe write the etag to disk
Header eTag = resp.getResponse().getFirstHeader(HttpHeaders.ETAG);
if (eTag != null) {
Files.write(eTagFile, Collections.singleton(eTag.getValue()));
}
if (imageBuffer != null) {
bufferedimage = imageBuffer.parseUserSkin(bufferedimage);
}
setBufferedImage(bufferedimage);
// Files.copy(resp.getInputStream(), cacheFile);
byte[] imageBytes = IOUtils.toByteArray(resp.getInputStream());
// encryption placeholder
byte[] outputBytes = new byte[imageBytes.length];
System.arraycopy(imageBytes, 0, outputBytes, 0, imageBytes.length);
// encryption placeholder end
FileUtils.writeByteArrayToFile(cacheFile.toFile(), outputBytes);
InputStream in = new ByteArrayInputStream(imageBytes);
BufferedImage bufferedimage = ImageIO.read(in);
if (imageBuffer != null) {
bufferedimage = imageBuffer.parseUserSkin(bufferedimage);
}
setBufferedImage(bufferedimage);
}
} catch (Exception exception) {
LOGGER.error("Couldn\'t download http texture", exception);