PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Close #859 - more favicon validation

Browse Source
This commit is contained in:
md_5 2014-02-02 12:20:37 +11:00
parent 5adc0000d8
commit ddab9a84c4
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
View File

@ -68,19 +68,25 @@ public class Configuration implements ProxyConfig
try try
{ {
BufferedImage image = ImageIO.read( fav ); BufferedImage image = ImageIO.read( fav );
if ( image.getHeight() == 64 && image.getWidth() == 64 ) if ( image != null )
{ {
ByteArrayOutputStream bytes = new ByteArrayOutputStream(); if ( image.getHeight() == 64 && image.getWidth() == 64 )
ImageIO.write( image, "png", bytes );
favicon = "data:image/png;base64," + BaseEncoding.base64().encode( bytes.toByteArray() );
if ( favicon.length() > Short.MAX_VALUE )
{ {
ProxyServer.getInstance().getLogger().log( Level.WARNING, "Favicon file too large for server to process" ); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
favicon = null; ImageIO.write( image, "png", bytes );
favicon = "data:image/png;base64," + BaseEncoding.base64().encode( bytes.toByteArray() );
if ( favicon.length() > Short.MAX_VALUE )
{
ProxyServer.getInstance().getLogger().log( Level.WARNING, "Favicon file too large for server to process" );
favicon = null;
}
} else
{
ProxyServer.getInstance().getLogger().log( Level.WARNING, "Server icon must be exactly 64x64 pixels" );
} }
} else } else
{ {
ProxyServer.getInstance().getLogger().log( Level.WARNING, "Server icon must be exactly 64x64 pixels" ); ProxyServer.getInstance().getLogger().log( Level.WARNING, "Could not load server icon for unknown reason. Please double check its format." );
} }
} catch ( IOException ex ) } catch ( IOException ex )
{ {