From 7ed849f21f9dd52203a668816bbadb619b6a4441 Mon Sep 17 00:00:00 2001 From: crawshaw Date: Thu, 6 Jan 2005 15:32:55 +0000 Subject: [PATCH] merge encoders into Encode.java darcs-hash:20050106153255-2eb37-36ebaa00a928b8555c0349bbfecefa176fe90ada.gz --- src/org/ibex/util/Base64.java | 194 -------------------- src/org/ibex/util/Encode.java | 265 +++++++++++++++++++++++++++- src/org/ibex/util/FileNameEncoder.java | 47 ----- src/org/ibex/util/PackBytesIntoString.java | 44 ----- 4 files changed, 262 insertions(+), 288 deletions(-) delete mode 100644 src/org/ibex/util/Base64.java delete mode 100644 src/org/ibex/util/FileNameEncoder.java delete mode 100644 src/org/ibex/util/PackBytesIntoString.java diff --git a/src/org/ibex/util/Base64.java b/src/org/ibex/util/Base64.java deleted file mode 100644 index b7f8900..0000000 --- a/src/org/ibex/util/Base64.java +++ /dev/null @@ -1,194 +0,0 @@ -// Copyright 2000-2005 the Contributors, as shown in the revision logs. -// Licensed under the Apache Public Source License 2.0 ("the License"). -// You may not use this file except in compliance with the License. - -package org.ibex.util; - -public class Base64 { - - private static final byte[] encodingTable = { - (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G', - (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N', - (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', - (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z', - (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g', - (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n', - (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u', - (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z', (byte)'0', (byte)'1', - (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7', (byte)'8', - (byte)'9', (byte)'+', (byte)'/' - }; - - // FIXME could be far more efficient - public static class InputStream extends java.io.ByteArrayInputStream { - public InputStream(String s) { super(decode(s.getBytes())); } - } - - /** - * encode the input data producong a base 64 encoded byte array. - * - * @return a byte array containing the base 64 encoded data. - */ - public static byte[] encode(byte[] data) { - byte[] bytes; - - int modulus = data.length % 3; - if (modulus == 0) { - bytes = new byte[4 * data.length / 3]; - } else { - bytes = new byte[4 * ((data.length / 3) + 1)]; - } - - int dataLength = (data.length - modulus); - int a1, a2, a3; - for (int i = 0, j = 0; i < dataLength; i += 3, j += 4) { - a1 = data[i] & 0xff; - a2 = data[i + 1] & 0xff; - a3 = data[i + 2] & 0xff; - - bytes[j] = encodingTable[(a1 >>> 2) & 0x3f]; - bytes[j + 1] = encodingTable[((a1 << 4) | (a2 >>> 4)) & 0x3f]; - bytes[j + 2] = encodingTable[((a2 << 2) | (a3 >>> 6)) & 0x3f]; - bytes[j + 3] = encodingTable[a3 & 0x3f]; - } - - int b1, b2, b3; - int d1, d2; - - switch (modulus) { - case 0: /* nothing left to do */ - break; - case 1: - d1 = data[data.length - 1] & 0xff; - b1 = (d1 >>> 2) & 0x3f; - b2 = (d1 << 4) & 0x3f; - - bytes[bytes.length - 4] = encodingTable[b1]; - bytes[bytes.length - 3] = encodingTable[b2]; - bytes[bytes.length - 2] = (byte)'='; - bytes[bytes.length - 1] = (byte)'='; - break; - case 2: - d1 = data[data.length - 2] & 0xff; - d2 = data[data.length - 1] & 0xff; - - b1 = (d1 >>> 2) & 0x3f; - b2 = ((d1 << 4) | (d2 >>> 4)) & 0x3f; - b3 = (d2 << 2) & 0x3f; - - bytes[bytes.length - 4] = encodingTable[b1]; - bytes[bytes.length - 3] = encodingTable[b2]; - bytes[bytes.length - 2] = encodingTable[b3]; - bytes[bytes.length - 1] = (byte)'='; - break; - } - - return bytes; - } - - private static final byte[] decodingTable; - - static { - decodingTable = new byte[128]; - for (int i = 'A'; i <= 'Z'; i++) decodingTable[i] = (byte)(i - 'A'); - for (int i = 'a'; i <= 'z'; i++) decodingTable[i] = (byte)(i - 'a' + 26); - for (int i = '0'; i <= '9'; i++) decodingTable[i] = (byte)(i - '0' + 52); - decodingTable['+'] = 62; - decodingTable['/'] = 63; - } - - /** - * decode the base 64 encoded input data. - * - * @return a byte array representing the decoded data. - */ - public static byte[] decode(byte[] data) { - byte[] bytes; - byte b1, b2, b3, b4; - - if (data[data.length - 2] == '=') bytes = new byte[(((data.length / 4) - 1) * 3) + 1]; - else if (data[data.length - 1] == '=') bytes = new byte[(((data.length / 4) - 1) * 3) + 2]; - else bytes = new byte[((data.length / 4) * 3)]; - - for (int i = 0, j = 0; i < data.length - 4; i += 4, j += 3) { - b1 = decodingTable[data[i]]; - b2 = decodingTable[data[i + 1]]; - b3 = decodingTable[data[i + 2]]; - b4 = decodingTable[data[i + 3]]; - - bytes[j] = (byte)((b1 << 2) | (b2 >> 4)); - bytes[j + 1] = (byte)((b2 << 4) | (b3 >> 2)); - bytes[j + 2] = (byte)((b3 << 6) | b4); - } - - if (data[data.length - 2] == '=') { - b1 = decodingTable[data[data.length - 4]]; - b2 = decodingTable[data[data.length - 3]]; - bytes[bytes.length - 1] = (byte)((b1 << 2) | (b2 >> 4)); - } else if (data[data.length - 1] == '=') { - b1 = decodingTable[data[data.length - 4]]; - b2 = decodingTable[data[data.length - 3]]; - b3 = decodingTable[data[data.length - 2]]; - bytes[bytes.length - 2] = (byte)((b1 << 2) | (b2 >> 4)); - bytes[bytes.length - 1] = (byte)((b2 << 4) | (b3 >> 2)); - } else { - b1 = decodingTable[data[data.length - 4]]; - b2 = decodingTable[data[data.length - 3]]; - b3 = decodingTable[data[data.length - 2]]; - b4 = decodingTable[data[data.length - 1]]; - bytes[bytes.length - 3] = (byte)((b1 << 2) | (b2 >> 4)); - bytes[bytes.length - 2] = (byte)((b2 << 4) | (b3 >> 2)); - bytes[bytes.length - 1] = (byte)((b3 << 6) | b4); - } - return bytes; - } - - /** - * decode the base 64 encoded String data. - * - * @return a byte array representing the decoded data. - */ - public static byte[] decode(String data) { - byte[] bytes; - byte b1, b2, b3, b4; - - if (data.charAt(data.length() - 2) == '=') - bytes = new byte[(((data.length() / 4) - 1) * 3) + 1]; - else if (data.charAt(data.length() - 1) == '=') - bytes = new byte[(((data.length() / 4) - 1) * 3) + 2]; - else - bytes = new byte[((data.length() / 4) * 3)]; - - for (int i = 0, j = 0; i < data.length() - 4; i += 4, j += 3) { - b1 = decodingTable[data.charAt(i)]; - b2 = decodingTable[data.charAt(i + 1)]; - b3 = decodingTable[data.charAt(i + 2)]; - b4 = decodingTable[data.charAt(i + 3)]; - - bytes[j] = (byte)((b1 << 2) | (b2 >> 4)); - bytes[j + 1] = (byte)((b2 << 4) | (b3 >> 2)); - bytes[j + 2] = (byte)((b3 << 6) | b4); - } - - if (data.charAt(data.length() - 2) == '=') { - b1 = decodingTable[data.charAt(data.length() - 4)]; - b2 = decodingTable[data.charAt(data.length() - 3)]; - bytes[bytes.length - 1] = (byte)((b1 << 2) | (b2 >> 4)); - } else if (data.charAt(data.length() - 1) == '=') { - b1 = decodingTable[data.charAt(data.length() - 4)]; - b2 = decodingTable[data.charAt(data.length() - 3)]; - b3 = decodingTable[data.charAt(data.length() - 2)]; - bytes[bytes.length - 2] = (byte)((b1 << 2) | (b2 >> 4)); - bytes[bytes.length - 1] = (byte)((b2 << 4) | (b3 >> 2)); - } else { - b1 = decodingTable[data.charAt(data.length() - 4)]; - b2 = decodingTable[data.charAt(data.length() - 3)]; - b3 = decodingTable[data.charAt(data.length() - 2)]; - b4 = decodingTable[data.charAt(data.length() - 1)]; - bytes[bytes.length - 3] = (byte)((b1 << 2) | (b2 >> 4)); - bytes[bytes.length - 2] = (byte)((b2 << 4) | (b3 >> 2)); - bytes[bytes.length - 1] = (byte)((b3 << 6) | b4); - } - return bytes; - } -} diff --git a/src/org/ibex/util/Encode.java b/src/org/ibex/util/Encode.java index 0a2b1d9..ad53c33 100644 --- a/src/org/ibex/util/Encode.java +++ b/src/org/ibex/util/Encode.java @@ -3,11 +3,270 @@ // You may not use this file except in compliance with the License. package org.ibex.util; + import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + +/** General String and byte[] processing functions, + * including Base64 and a safe filename transform. + * + * @author adam@ibex.org + */ +public final class Encode { + private static final char[] fn = + new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + + public static String toFilename(String s) { + StringBuffer sb = new StringBuffer(); + try { + byte[] b = s.getBytes("UTF-8"); + for(int i=0; i 126 || c == '%' || (i == 0 && c == '.')) + sb.append("%" + fn[(b[i] & 0xf0) >> 8] + fn[b[i] & 0xf]); + else sb.append(c); + } + return sb.toString(); + } catch (UnsupportedEncodingException uee) { + throw new Error("this should never happen; Java spec mandates UTF-8 support"); + } + } + + public static String fromFilename(String s) { + StringBuffer sb = new StringBuffer(); + byte[] b = new byte[s.length() * 2]; + int bytes = 0; + for(int i=0; i>> 2) & 0x3f]; + bytes[j + 1] = encB64[((a1 << 4) | (a2 >>> 4)) & 0x3f]; + bytes[j + 2] = encB64[((a2 << 2) | (a3 >>> 6)) & 0x3f]; + bytes[j + 3] = encB64[a3 & 0x3f]; + } + + int b1, b2, b3; + int d1, d2; + switch (modulus) { + case 0: /* nothing left to do */ + break; + case 1: + d1 = data[data.length - 1] & 0xff; + b1 = (d1 >>> 2) & 0x3f; + b2 = (d1 << 4) & 0x3f; + + bytes[bytes.length - 4] = encB64[b1]; + bytes[bytes.length - 3] = encB64[b2]; + bytes[bytes.length - 2] = (byte)'='; + bytes[bytes.length - 1] = (byte)'='; + break; + case 2: + d1 = data[data.length - 2] & 0xff; + d2 = data[data.length - 1] & 0xff; + + b1 = (d1 >>> 2) & 0x3f; + b2 = ((d1 << 4) | (d2 >>> 4)) & 0x3f; + b3 = (d2 << 2) & 0x3f; + + bytes[bytes.length - 4] = encB64[b1]; + bytes[bytes.length - 3] = encB64[b2]; + bytes[bytes.length - 2] = encB64[b3]; + bytes[bytes.length - 1] = (byte)'='; + break; + } + + return bytes; + } + -public class Encode { + private static final byte[] decB64 = new byte[128]; + static { + for (int i = 'A'; i <= 'Z'; i++) decB64[i] = (byte)(i - 'A'); + for (int i = 'a'; i <= 'z'; i++) decB64[i] = (byte)(i - 'a' + 26); + for (int i = '0'; i <= '9'; i++) decB64[i] = (byte)(i - '0' + 52); + decB64['+'] = 62; + decB64['/'] = 63; + } + + /** Decode base 64 encoded input data. + * @return A byte array representing the decoded data. */ + public static byte[] fromBase64(byte[] data) { + byte[] bytes; + byte b1, b2, b3, b4; + + if (data[data.length - 2] == '=') bytes = new byte[(((data.length / 4) - 1) * 3) + 1]; + else if (data[data.length - 1] == '=') bytes = new byte[(((data.length / 4) - 1) * 3) + 2]; + else bytes = new byte[((data.length / 4) * 3)]; + + for (int i = 0, j = 0; i < data.length - 4; i += 4, j += 3) { + b1 = decB64[data[i]]; + b2 = decB64[data[i + 1]]; + b3 = decB64[data[i + 2]]; + b4 = decB64[data[i + 3]]; + + bytes[j] = (byte)((b1 << 2) | (b2 >> 4)); + bytes[j + 1] = (byte)((b2 << 4) | (b3 >> 2)); + bytes[j + 2] = (byte)((b3 << 6) | b4); + } + + if (data[data.length - 2] == '=') { + b1 = decB64[data[data.length - 4]]; + b2 = decB64[data[data.length - 3]]; + bytes[bytes.length - 1] = (byte)((b1 << 2) | (b2 >> 4)); + } else if (data[data.length - 1] == '=') { + b1 = decB64[data[data.length - 4]]; + b2 = decB64[data[data.length - 3]]; + b3 = decB64[data[data.length - 2]]; + bytes[bytes.length - 2] = (byte)((b1 << 2) | (b2 >> 4)); + bytes[bytes.length - 1] = (byte)((b2 << 4) | (b3 >> 2)); + } else { + b1 = decB64[data[data.length - 4]]; + b2 = decB64[data[data.length - 3]]; + b3 = decB64[data[data.length - 2]]; + b4 = decB64[data[data.length - 1]]; + bytes[bytes.length - 3] = (byte)((b1 << 2) | (b2 >> 4)); + bytes[bytes.length - 2] = (byte)((b2 << 4) | (b3 >> 2)); + bytes[bytes.length - 1] = (byte)((b3 << 6) | b4); + } + return bytes; + } + + /** Decode a base 64 encoded String. + * @return A byte array representing the decoded data. */ + public static byte[] fromBase64(String data) { + byte[] bytes; + byte b1, b2, b3, b4; + + if (data.charAt(data.length() - 2) == '=') + bytes = new byte[(((data.length() / 4) - 1) * 3) + 1]; + else if (data.charAt(data.length() - 1) == '=') + bytes = new byte[(((data.length() / 4) - 1) * 3) + 2]; + else + bytes = new byte[((data.length() / 4) * 3)]; + + for (int i = 0, j = 0; i < data.length() - 4; i += 4, j += 3) { + b1 = decB64[data.charAt(i)]; + b2 = decB64[data.charAt(i + 1)]; + b3 = decB64[data.charAt(i + 2)]; + b4 = decB64[data.charAt(i + 3)]; + + bytes[j] = (byte)((b1 << 2) | (b2 >> 4)); + bytes[j + 1] = (byte)((b2 << 4) | (b3 >> 2)); + bytes[j + 2] = (byte)((b3 << 6) | b4); + } + + if (data.charAt(data.length() - 2) == '=') { + b1 = decB64[data.charAt(data.length() - 4)]; + b2 = decB64[data.charAt(data.length() - 3)]; + bytes[bytes.length - 1] = (byte)((b1 << 2) | (b2 >> 4)); + } else if (data.charAt(data.length() - 1) == '=') { + b1 = decB64[data.charAt(data.length() - 4)]; + b2 = decB64[data.charAt(data.length() - 3)]; + b3 = decB64[data.charAt(data.length() - 2)]; + bytes[bytes.length - 2] = (byte)((b1 << 2) | (b2 >> 4)); + bytes[bytes.length - 1] = (byte)((b2 << 4) | (b3 >> 2)); + } else { + b1 = decB64[data.charAt(data.length() - 4)]; + b2 = decB64[data.charAt(data.length() - 3)]; + b3 = decB64[data.charAt(data.length() - 2)]; + b4 = decB64[data.charAt(data.length() - 1)]; + bytes[bytes.length - 3] = (byte)((b1 << 2) | (b2 >> 4)); + bytes[bytes.length - 2] = (byte)((b2 << 4) | (b3 >> 2)); + bytes[bytes.length - 1] = (byte)((b3 << 6) | b4); + } + return bytes; + } + + + /** Packs 8-bit bytes into a String of 7-bit chars. + * @throws IllegalArgumentException when len is not a multiple of 7. + * @return A String representing the processed bytes. */ + public static String toStringFrom8bit(byte[] b, int off, int len) throws IllegalArgumentException { + if (len % 7 != 0) throw new IllegalArgumentException("len must be a multiple of 7"); + StringBuffer ret = new StringBuffer(); + for(int i=off; i=0; j--) { + l <<= 8; + l |= (b[i + j] & 0xff); + } + for(int j=0; j<8; j++) { + ret.append((char)(l & 0x7f)); + l >>= 7; + } + } + return ret.toString(); + } + + /** Packs a String of 7-bit chars into 8-bit bytes. + * @throws IllegalArgumentException when s.length() is not a multiple of 8. + * @return A byte array representing the processed String. */ + public static byte[] fromStringTo8bit(String s) throws IllegalArgumentException { + if (s.length() % 8 != 0) throw new IllegalArgumentException("string length must be a multiple of 8"); + byte[] ret = new byte[(s.length() / 8) * 7]; + for(int i=0; i=0; j--) { + l <<= 7; + l |= (s.charAt(i + j) & 0x7fL); + } + for(int j=0; j<7; j++) { + ret[(i / 8) * 7 + j] = (byte)(l & 0xff); + l >>= 8; + } + } + return ret; + } public static class JavaSourceCode { diff --git a/src/org/ibex/util/FileNameEncoder.java b/src/org/ibex/util/FileNameEncoder.java deleted file mode 100644 index 1e903c0..0000000 --- a/src/org/ibex/util/FileNameEncoder.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2000-2005 the Contributors, as shown in the revision logs. -// Licensed under the Apache Public Source License 2.0 ("the License"). -// You may not use this file except in compliance with the License. - -package org.ibex.util; -import java.util.*; -import java.io.*; - -/** provides commands to urlencode and urldecode strings, making sure - * to escape sequences which have special meanings in filenames */ -public class FileNameEncoder { - - private static final char[] hex = - new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; - - public static String encode(String s) { - StringBuffer sb = new StringBuffer(); - try { - byte[] b = s.getBytes("UTF-8"); - for(int i=0; i 126 || c == '%' || (i == 0 && c == '.')) - sb.append("%" + hex[(b[i] & 0xf0) >> 8] + hex[b[i] & 0xf]); - else sb.append(c); - } - return sb.toString(); - } catch (UnsupportedEncodingException uee) { - throw new Error("this should never happen; Java spec mandates UTF-8 support"); - } - } - - public static String decode(String s) { - StringBuffer sb = new StringBuffer(); - byte[] b = new byte[s.length() * 2]; - int bytes = 0; - for(int i=0; i=0; j--) { - l <<= 8; - l |= (b[i + j] & 0xff); - } - for(int j=0; j<8; j++) { - ret.append((char)(l & 0x7f)); - l >>= 7; - } - } - return ret.toString(); - } - - public static byte[] unpack(String s) throws IllegalArgumentException { - if (s.length() % 8 != 0) throw new IllegalArgumentException("string length must be a multiple of 8"); - byte[] ret = new byte[(s.length() / 8) * 7]; - for(int i=0; i=0; j--) { - l <<= 7; - l |= (s.charAt(i + j) & 0x7fL); - } - for(int j=0; j<7; j++) { - ret[(i / 8) * 7 + j] = (byte)(l & 0xff); - l >>= 8; - } - } - return ret; - } -} - -- 1.7.10.4