From e0c73ef8333ffb346afe727c25c3f536478727fb Mon Sep 17 00:00:00 2001 From: sasinda Date: Wed, 1 Aug 2012 19:08:21 +0530 Subject: [PATCH] Security Module basics complete. Added security.Master --- .../xwiki/android/client/dev/QuickTest.java | 21 +- .../src/org/xwiki/android/entity/User.java | 53 +- .../org/xwiki/android/security/Master.java | 171 ++++++ .../xwiki/android/security/util/Base64.java | 580 ++++++++++++++++++ .../android/test/rest/TestResources.java | 2 +- .../rest/{ => tstProperties}/ClassTest.java | 3 +- 6 files changed, 803 insertions(+), 27 deletions(-) create mode 100644 xwiki-android-core/src/org/xwiki/android/security/Master.java create mode 100644 xwiki-android-core/src/org/xwiki/android/security/util/Base64.java rename xwiki-android-test-rest/src/org/xwiki/android/test/rest/{ => tstProperties}/ClassTest.java (95%) diff --git a/xwiki-android-client/src/org/xwiki/android/client/dev/QuickTest.java b/xwiki-android-client/src/org/xwiki/android/client/dev/QuickTest.java index efe1bf2..3305da3 100644 --- a/xwiki-android-client/src/org/xwiki/android/client/dev/QuickTest.java +++ b/xwiki-android-client/src/org/xwiki/android/client/dev/QuickTest.java @@ -12,6 +12,8 @@ import org.xwiki.android.rest.reference.DocumentReference; +import org.xwiki.android.security.Master; + import org.xwiki.android.xmodel.entity.Document; import com.j256.ormlite.dao.Dao; @@ -20,13 +22,16 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.os.Bundle; +import android.util.Log; /** * class for test purposes . * @author xwiki gsoc 2012 * */ public class QuickTest extends Activity { - @Override + private static final String TAG = "Quikc TEST"; + + @Override protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onCreate(savedInstanceState); @@ -39,7 +44,7 @@ public void onClick(DialogInterface arg0, int arg1){} }); alertbox.show(); - XWikiApplicationContext ctx=(XWikiApplicationContext)getApplicationContext(); + /*XWikiApplicationContext ctx=(XWikiApplicationContext)getApplicationContext(); EntityManager em=ctx.newEntityManager(); try { Dao dao=em.getDao(SyncOutEntity.class); @@ -55,10 +60,14 @@ public void onClick(DialogInterface arg0, int arg1){} } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); - } - - // RESTfulManager mngr=new XmlRESTFulManager(); -// } // mngr.getDocumentRao(new DocumentRaoCallback(){}); + }*/ + + //test enc + Master secMstr=new Master(); + String cipher=secMstr.encryptPassword("abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&*()"); + Log.d( TAG, cipher); + Log.d(TAG, secMstr.decryptPassword(cipher)); + } } diff --git a/xwiki-android-core/src/org/xwiki/android/entity/User.java b/xwiki-android-core/src/org/xwiki/android/entity/User.java index d97b214..0efe9ae 100644 --- a/xwiki-android-core/src/org/xwiki/android/entity/User.java +++ b/xwiki-android-core/src/org/xwiki/android/entity/User.java @@ -1,5 +1,7 @@ package org.xwiki.android.entity; +import org.xwiki.android.security.Master; + import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; @@ -22,15 +24,34 @@ public class User implements Cloneable @DatabaseField(canBeNull = false, uniqueCombo = true, useGetSet = true) private String userName; - @DatabaseField(useGetSet = true) - private String password;// todo: when enc enable. Use pers field encPwd instead of pwd and make getPassword() - // decrypt and store val in pwd field + @DatabaseField() + private String encPassword; + + private String password; @DatabaseField(useGetSet = true) private String email; @DatabaseField(uniqueCombo = true, useGetSet = true) private String wikiRealm; + + // constructors + public User() + { + } + + public User(String firstName, String lastName, String userName, String password, String wikiRealm, String email) + { + super(); + this.firstName = firstName; + this.lastName = lastName; + this.userName = userName; + this.password = password; + this.email = email; + this.wikiRealm = wikiRealm; + } + + public String getWikiRealm() { @@ -84,12 +105,18 @@ public void setUserName(String userName) } /** - * use security utils to decrypt the pwd. return The decrypted pwd. null if not stored + * uses security utils to decrypt the pwd. return The decrypted pwd. null if not stored * * @return encrypted Password */ public String getPassword() { + if (password == null) { + Master m = new Master(); + if (encPassword != null) { + password = m.decryptPassword(encPassword); + } + } return password; } @@ -99,6 +126,8 @@ public String getPassword() public void setPassword(String password) { this.password = password; + this.encPassword = new Master().encryptPassword(password); + } public String getEmail() @@ -123,20 +152,6 @@ public User clone() return u; } - // constructors - public User() - { - } - - public User(String firstName, String lastName, String userName, String password, String wikiRealm, String email) - { - super(); - this.firstName = firstName; - this.lastName = lastName; - this.userName = userName; - this.password = password; - this.email = email; - this.wikiRealm = wikiRealm; - } + } diff --git a/xwiki-android-core/src/org/xwiki/android/security/Master.java b/xwiki-android-core/src/org/xwiki/android/security/Master.java new file mode 100644 index 0000000..5f3112b --- /dev/null +++ b/xwiki-android-core/src/org/xwiki/android/security/Master.java @@ -0,0 +1,171 @@ +package org.xwiki.android.security; + +import java.io.UnsupportedEncodingException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.SecretKeySpec; + +import org.xwiki.android.security.util.Base64; + +import android.util.Log; + +/** + * @author xwiki gsoc 2012 + * This is the Master class that will encrypt decrypt all user passwords. + * This has methods to generate private keys for users and keep them safe. + * All user's private secret keys are encrypted using the master key. + */ +public class Master +{ + + private static final String TAG = "Security"; + SecretKeySpec masterKey; + Cipher masterCipher; + + + public Master() + { + masterKey = getMasterKey(); + try { + masterCipher = Cipher.getInstance("AES/ECB/PKCS7Padding"); + } catch (NoSuchAlgorithmException e) { + Log.e(TAG, "ENC algo missing: pwds will be saved in plaintext", e); + } catch (NoSuchPaddingException e) { + Log.e(TAG, "Padding scheme missing: pwds will be saved in plaintext", e); + } + + + } + + /** + * Encrypt a secret string. + * @param plainTextPwd + * @return BASE64 encoded password cypher text string. + */ + public String encryptPassword(String plainTextPwd) + { + if (masterCipher == null) + return plainTextPwd; + + byte[] input = null; + + try { + input = plainTextPwd.getBytes("UTF8"); + masterCipher.init(Cipher.ENCRYPT_MODE, masterKey); + byte[] output = new byte[masterCipher.getOutputSize(input.length)]; + int outputLen = masterCipher.update(input, 0, input.length, output, 0); + masterCipher.doFinal(output, outputLen); + String out=Base64.encodeToString(output, true); + return out; + } catch (InvalidKeyException e) { + Log.e(TAG, "invalid key. In Master"); + } catch (ShortBufferException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalBlockSizeException e) { + Log.d(TAG, "", e); + + } catch (BadPaddingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (UnsupportedEncodingException e) { + // TODO Auto-generated catch block + Log.e(TAG, "UTF8 not supported ?"); + } + return plainTextPwd; + } + + /** + * + * @param pwdCipherText : base 64 encoded cypher text. + * @return UTF8 encoded plain text. + */ + public String decryptPassword(String pwdCipherText) + { + if (masterCipher == null) + return pwdCipherText; + + byte[] input = null; + + try { + input =Base64.decode(pwdCipherText); + masterCipher.init(Cipher.DECRYPT_MODE, masterKey); + /*byte[] output = new byte[masterCipher.getOutputSize(input.length)]; + int outputLen = masterCipher.update(input, 0, input.length, output, 0); + masterCipher.doFinal(output, outputLen);*/ + byte[] output=masterCipher.doFinal(input); + return new String(output, "UTF8"); + } catch (InvalidKeyException e) { + Log.e(TAG, "invalid key. In Master"); +// } catch (ShortBufferException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); + } catch (IllegalBlockSizeException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (BadPaddingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (UnsupportedEncodingException e) { + Log.e(TAG, "UTF8 not supported ?"); + } + return pwdCipherText; + } + /** + * Encrypt a secret key. + * @param key as a encoded String. + * @return BASE64 encoded password cypher text string. + */ + public String encryptKey(String key){ + return encryptPassword(key); + } + /** + * + * @param keyCipher should be a base64 encoded string. + * @return key base64 coded key String coded again with UTF8. + */ + public String decryptKey(String keyCipher){ + return decryptPassword(keyCipher); + } + + public byte[] generateRawKey(String algorithm){ + // Generate a key + KeyGenerator keyGen; + try { + keyGen = KeyGenerator.getInstance(algorithm); + SecretKey key = keyGen.generateKey(); + + // Get the bytes of the key + byte[] keyBytes = key.getEncoded(); + return keyBytes; + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } + + public String generateEncKey(String algorithm){ + byte[] keyBytes=generateRawKey(algorithm); + return Base64.encodeToString(keyBytes, true); + } + + private SecretKeySpec getMasterKey() + { + byte[] keyBytes = + new byte[] {0x01, 0x05, 0x07, 0x03, 0x04, 0x08, 0x05, 0x12, 0x17, 0x09, 0x0a, 0x0c, 0x05, 0x09, 0x1e, 0x1a, + 0x1a, 0x11, 0x14, 0x13, 0x14, 0x19, 0x16, 0x17}; + // TODO save this somewhere safe ;-) + SecretKeySpec key = new SecretKeySpec(keyBytes, "AES"); + return key; + } + +} diff --git a/xwiki-android-core/src/org/xwiki/android/security/util/Base64.java b/xwiki-android-core/src/org/xwiki/android/security/util/Base64.java new file mode 100644 index 0000000..979258a --- /dev/null +++ b/xwiki-android-core/src/org/xwiki/android/security/util/Base64.java @@ -0,0 +1,580 @@ +package org.xwiki.android.security.util; + +import java.util.Arrays; + +/** A very fast and memory efficient class to encode and decode to and from BASE64 in full accordance + * with RFC 2045.

+ * On Windows XP sp1 with 1.4.2_04 and later ;), this encoder and decoder is about 10 times faster + * on small arrays (10 - 1000 bytes) and 2-3 times as fast on larger arrays (10000 - 1000000 bytes) + * compared to sun.misc.Encoder()/Decoder().

+ * + * On byte arrays the encoder is about 20% faster than Jakarta Commons Base64 Codec for encode and + * about 50% faster for decoding large arrays. This implementation is about twice as fast on very small + * arrays (< 30 bytes). If source/destination is a String this + * version is about three times as fast due to the fact that the Commons Codec result has to be recoded + * to a String from byte[], which is very expensive.

+ * + * This encode/decode algorithm doesn't create any temporary arrays as many other codecs do, it only + * allocates the resulting array. This produces less garbage and it is possible to handle arrays twice + * as large as algorithms that create a temporary array. (E.g. Jakarta Commons Codec). It is unknown + * whether Sun's sun.misc.Encoder()/Decoder() produce temporary arrays but since performance + * is quite low it probably does.

+ * + * The encoder produces the same output as the Sun one except that the Sun's encoder appends + * a trailing line separator if the last character isn't a pad. Unclear why but it only adds to the + * length and is probably a side effect. Both are in conformance with RFC 2045 though.
+ * Commons codec seem to always att a trailing line separator.

+ * + * Note! + * The encode/decode method pairs (types) come in three versions with the exact same algorithm and + * thus a lot of code redundancy. This is to not create any temporary arrays for transcoding to/from different + * format types. The methods not used can simply be commented out.

+ * + * There is also a "fast" version of all decode methods that works the same way as the normal ones, but + * har a few demands on the decoded input. Normally though, these fast verions should be used if the source if + * the input is known and it hasn't bee tampered with.

+ * + * If you find the code useful or you find a bug, please send me a note at base64 @ miginfocom . com. + * + * Licence (BSD): + * ============== + * + * Copyright (c) 2004, Mikael Grev, MiG InfoCom AB. (base64 @ miginfocom . com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * Neither the name of the MiG InfoCom AB nor the names of its contributors may be + * used to endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * @version 2.2 + * @author Mikael Grev + * Date: 2004-aug-02 + * Time: 11:31:11 + */ + +/** + * + * This is used as a replacement to android.util.Base64 wich is available from API 8 and up. + * + */ +public class Base64 +{ + private static final char[] CA = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray(); + private static final int[] IA = new int[256]; + static { + Arrays.fill(IA, -1); + for (int i = 0, iS = CA.length; i < iS; i++) + IA[CA[i]] = i; + IA['='] = 0; + } + + // **************************************************************************************** + // * char[] version + // **************************************************************************************** + + /** Encodes a raw byte array into a BASE64 char[] representation i accordance with RFC 2045. + * @param sArr The bytes to convert. If null or length 0 an empty array will be returned. + * @param lineSep Optional "\r\n" after 76 characters, unless end of file.
+ * No line separator will be in breach of RFC 2045 which specifies max 76 per line but will be a + * little faster. + * @return A BASE64 encoded array. Never null. + */ + public final static char[] encodeToChar(byte[] sArr, boolean lineSep) + { + // Check special case + int sLen = sArr != null ? sArr.length : 0; + if (sLen == 0) + return new char[0]; + + int eLen = (sLen / 3) * 3; // Length of even 24-bits. + int cCnt = ((sLen - 1) / 3 + 1) << 2; // Returned character count + int dLen = cCnt + (lineSep ? (cCnt - 1) / 76 << 1 : 0); // Length of returned array + char[] dArr = new char[dLen]; + + // Encode even 24-bits + for (int s = 0, d = 0, cc = 0; s < eLen;) { + // Copy next three bytes into lower 24 bits of int, paying attension to sign. + int i = (sArr[s++] & 0xff) << 16 | (sArr[s++] & 0xff) << 8 | (sArr[s++] & 0xff); + + // Encode the int into four chars + dArr[d++] = CA[(i >>> 18) & 0x3f]; + dArr[d++] = CA[(i >>> 12) & 0x3f]; + dArr[d++] = CA[(i >>> 6) & 0x3f]; + dArr[d++] = CA[i & 0x3f]; + + // Add optional line separator + if (lineSep && ++cc == 19 && d < dLen - 2) { + dArr[d++] = '\r'; + dArr[d++] = '\n'; + cc = 0; + } + } + + // Pad and encode last bits if source isn't even 24 bits. + int left = sLen - eLen; // 0 - 2. + if (left > 0) { + // Prepare the int + int i = ((sArr[eLen] & 0xff) << 10) | (left == 2 ? ((sArr[sLen - 1] & 0xff) << 2) : 0); + + // Set last four chars + dArr[dLen - 4] = CA[i >> 12]; + dArr[dLen - 3] = CA[(i >>> 6) & 0x3f]; + dArr[dLen - 2] = left == 2 ? CA[i & 0x3f] : '='; + dArr[dLen - 1] = '='; + } + return dArr; + } + + /** Decodes a BASE64 encoded char array. All illegal characters will be ignored and can handle both arrays with + * and without line separators. + * @param sArr The source array. null or length 0 will return an empty array. + * @return The decoded array of bytes. May be of length 0. Will be null if the legal characters + * (including '=') isn't divideable by 4. (I.e. definitely corrupted). + */ + public final static byte[] decode(char[] sArr) + { + // Check special case + int sLen = sArr != null ? sArr.length : 0; + if (sLen == 0) + return new byte[0]; + + // Count illegal characters (including '\r', '\n') to know what size the returned array will be, + // so we don't have to reallocate & copy it later. + int sepCnt = 0; // Number of separator characters. (Actually illegal characters, but that's a bonus...) + for (int i = 0; i < sLen; i++) // If input is "pure" (I.e. no line separators or illegal chars) base64 this loop can be commented out. + if (IA[sArr[i]] < 0) + sepCnt++; + + // Check so that legal chars (including '=') are evenly divideable by 4 as specified in RFC 2045. + if ((sLen - sepCnt) % 4 != 0) + return null; + + int pad = 0; + for (int i = sLen; i > 1 && IA[sArr[--i]] <= 0;) + if (sArr[i] == '=') + pad++; + + int len = ((sLen - sepCnt) * 6 >> 3) - pad; + + byte[] dArr = new byte[len]; // Preallocate byte[] of exact length + + for (int s = 0, d = 0; d < len;) { + // Assemble three bytes into an int from four "valid" characters. + int i = 0; + for (int j = 0; j < 4; j++) { // j only increased if a valid char was found. + int c = IA[sArr[s++]]; + if (c >= 0) + i |= c << (18 - j * 6); + else + j--; + } + // Add the bytes + dArr[d++] = (byte) (i >> 16); + if (d < len) { + dArr[d++]= (byte) (i >> 8); + if (d < len) + dArr[d++] = (byte) i; + } + } + return dArr; + } + + /** Decodes a BASE64 encoded char array that is known to be resonably well formatted. The method is about twice as + * fast as {@link #decode(char[])}. The preconditions are:
+ * + The array must have a line length of 76 chars OR no line separators at all (one line).
+ * + Line separator must be "\r\n", as specified in RFC 2045 + * + The array must not contain illegal characters within the encoded string
+ * + The array CAN have illegal characters at the beginning and end, those will be dealt with appropriately.
+ * @param sArr The source array. Length 0 will return an empty array. null will throw an exception. + * @return The decoded array of bytes. May be of length 0. + */ + public final static byte[] decodeFast(char[] sArr) + { + // Check special case + int sLen = sArr.length; + if (sLen == 0) + return new byte[0]; + + int sIx = 0, eIx = sLen - 1; // Start and end index after trimming. + + // Trim illegal chars from start + while (sIx < eIx && IA[sArr[sIx]] < 0) + sIx++; + + // Trim illegal chars from end + while (eIx > 0 && IA[sArr[eIx]] < 0) + eIx--; + + // get the padding count (=) (0, 1 or 2) + int pad = sArr[eIx] == '=' ? (sArr[eIx - 1] == '=' ? 2 : 1) : 0; // Count '=' at end. + int cCnt = eIx - sIx + 1; // Content count including possible separators + int sepCnt = sLen > 76 ? (sArr[76] == '\r' ? cCnt / 78 : 0) << 1 : 0; + + int len = ((cCnt - sepCnt) * 6 >> 3) - pad; // The number of decoded bytes + byte[] dArr = new byte[len]; // Preallocate byte[] of exact length + + // Decode all but the last 0 - 2 bytes. + int d = 0; + for (int cc = 0, eLen = (len / 3) * 3; d < eLen;) { + // Assemble three bytes into an int from four "valid" characters. + int i = IA[sArr[sIx++]] << 18 | IA[sArr[sIx++]] << 12 | IA[sArr[sIx++]] << 6 | IA[sArr[sIx++]]; + + // Add the bytes + dArr[d++] = (byte) (i >> 16); + dArr[d++] = (byte) (i >> 8); + dArr[d++] = (byte) i; + + // If line separator, jump over it. + if (sepCnt > 0 && ++cc == 19) { + sIx += 2; + cc = 0; + } + } + + if (d < len) { + // Decode last 1-3 bytes (incl '=') into 1-3 bytes + int i = 0; + for (int j = 0; sIx <= eIx - pad; j++) + i |= IA[sArr[sIx++]] << (18 - j * 6); + + for (int r = 16; d < len; r -= 8) + dArr[d++] = (byte) (i >> r); + } + + return dArr; + } + + // **************************************************************************************** + // * byte[] version + // **************************************************************************************** + + /** Encodes a raw byte array into a BASE64 byte[] representation i accordance with RFC 2045. + * @param sArr The bytes to convert. If null or length 0 an empty array will be returned. + * @param lineSep Optional "\r\n" after 76 characters, unless end of file.
+ * No line separator will be in breach of RFC 2045 which specifies max 76 per line but will be a + * little faster. + * @return A BASE64 encoded array. Never null. + */ + public final static byte[] encodeToByte(byte[] sArr, boolean lineSep) + { + // Check special case + int sLen = sArr != null ? sArr.length : 0; + if (sLen == 0) + return new byte[0]; + + int eLen = (sLen / 3) * 3; // Length of even 24-bits. + int cCnt = ((sLen - 1) / 3 + 1) << 2; // Returned character count + int dLen = cCnt + (lineSep ? (cCnt - 1) / 76 << 1 : 0); // Length of returned array + byte[] dArr = new byte[dLen]; + + // Encode even 24-bits + for (int s = 0, d = 0, cc = 0; s < eLen;) { + // Copy next three bytes into lower 24 bits of int, paying attension to sign. + int i = (sArr[s++] & 0xff) << 16 | (sArr[s++] & 0xff) << 8 | (sArr[s++] & 0xff); + + // Encode the int into four chars + dArr[d++] = (byte) CA[(i >>> 18) & 0x3f]; + dArr[d++] = (byte) CA[(i >>> 12) & 0x3f]; + dArr[d++] = (byte) CA[(i >>> 6) & 0x3f]; + dArr[d++] = (byte) CA[i & 0x3f]; + + // Add optional line separator + if (lineSep && ++cc == 19 && d < dLen - 2) { + dArr[d++] = '\r'; + dArr[d++] = '\n'; + cc = 0; + } + } + + // Pad and encode last bits if source isn't an even 24 bits. + int left = sLen - eLen; // 0 - 2. + if (left > 0) { + // Prepare the int + int i = ((sArr[eLen] & 0xff) << 10) | (left == 2 ? ((sArr[sLen - 1] & 0xff) << 2) : 0); + + // Set last four chars + dArr[dLen - 4] = (byte) CA[i >> 12]; + dArr[dLen - 3] = (byte) CA[(i >>> 6) & 0x3f]; + dArr[dLen - 2] = left == 2 ? (byte) CA[i & 0x3f] : (byte) '='; + dArr[dLen - 1] = '='; + } + return dArr; + } + + /** Decodes a BASE64 encoded byte array. All illegal characters will be ignored and can handle both arrays with + * and without line separators. + * @param sArr The source array. Length 0 will return an empty array. null will throw an exception. + * @return The decoded array of bytes. May be of length 0. Will be null if the legal characters + * (including '=') isn't divideable by 4. (I.e. definitely corrupted). + */ + public final static byte[] decode(byte[] sArr) + { + // Check special case + int sLen = sArr.length; + + // Count illegal characters (including '\r', '\n') to know what size the returned array will be, + // so we don't have to reallocate & copy it later. + int sepCnt = 0; // Number of separator characters. (Actually illegal characters, but that's a bonus...) + for (int i = 0; i < sLen; i++) // If input is "pure" (I.e. no line separators or illegal chars) base64 this loop can be commented out. + if (IA[sArr[i] & 0xff] < 0) + sepCnt++; + + // Check so that legal chars (including '=') are evenly divideable by 4 as specified in RFC 2045. + if ((sLen - sepCnt) % 4 != 0) + return null; + + int pad = 0; + for (int i = sLen; i > 1 && IA[sArr[--i] & 0xff] <= 0;) + if (sArr[i] == '=') + pad++; + + int len = ((sLen - sepCnt) * 6 >> 3) - pad; + + byte[] dArr = new byte[len]; // Preallocate byte[] of exact length + + for (int s = 0, d = 0; d < len;) { + // Assemble three bytes into an int from four "valid" characters. + int i = 0; + for (int j = 0; j < 4; j++) { // j only increased if a valid char was found. + int c = IA[sArr[s++] & 0xff]; + if (c >= 0) + i |= c << (18 - j * 6); + else + j--; + } + + // Add the bytes + dArr[d++] = (byte) (i >> 16); + if (d < len) { + dArr[d++]= (byte) (i >> 8); + if (d < len) + dArr[d++] = (byte) i; + } + } + + return dArr; + } + + + /** Decodes a BASE64 encoded byte array that is known to be resonably well formatted. The method is about twice as + * fast as {@link #decode(byte[])}. The preconditions are:
+ * + The array must have a line length of 76 chars OR no line separators at all (one line).
+ * + Line separator must be "\r\n", as specified in RFC 2045 + * + The array must not contain illegal characters within the encoded string
+ * + The array CAN have illegal characters at the beginning and end, those will be dealt with appropriately.
+ * @param sArr The source array. Length 0 will return an empty array. null will throw an exception. + * @return The decoded array of bytes. May be of length 0. + */ + public final static byte[] decodeFast(byte[] sArr) + { + // Check special case + int sLen = sArr.length; + if (sLen == 0) + return new byte[0]; + + int sIx = 0, eIx = sLen - 1; // Start and end index after trimming. + + // Trim illegal chars from start + while (sIx < eIx && IA[sArr[sIx] & 0xff] < 0) + sIx++; + + // Trim illegal chars from end + while (eIx > 0 && IA[sArr[eIx] & 0xff] < 0) + eIx--; + + // get the padding count (=) (0, 1 or 2) + int pad = sArr[eIx] == '=' ? (sArr[eIx - 1] == '=' ? 2 : 1) : 0; // Count '=' at end. + int cCnt = eIx - sIx + 1; // Content count including possible separators + int sepCnt = sLen > 76 ? (sArr[76] == '\r' ? cCnt / 78 : 0) << 1 : 0; + + int len = ((cCnt - sepCnt) * 6 >> 3) - pad; // The number of decoded bytes + byte[] dArr = new byte[len]; // Preallocate byte[] of exact length + + // Decode all but the last 0 - 2 bytes. + int d = 0; + for (int cc = 0, eLen = (len / 3) * 3; d < eLen;) { + // Assemble three bytes into an int from four "valid" characters. + int i = IA[sArr[sIx++]] << 18 | IA[sArr[sIx++]] << 12 | IA[sArr[sIx++]] << 6 | IA[sArr[sIx++]]; + + // Add the bytes + dArr[d++] = (byte) (i >> 16); + dArr[d++] = (byte) (i >> 8); + dArr[d++] = (byte) i; + + // If line separator, jump over it. + if (sepCnt > 0 && ++cc == 19) { + sIx += 2; + cc = 0; + } + } + + if (d < len) { + // Decode last 1-3 bytes (incl '=') into 1-3 bytes + int i = 0; + for (int j = 0; sIx <= eIx - pad; j++) + i |= IA[sArr[sIx++]] << (18 - j * 6); + + for (int r = 16; d < len; r -= 8) + dArr[d++] = (byte) (i >> r); + } + + return dArr; + } + + // **************************************************************************************** + // * String version + // **************************************************************************************** + + /** Encodes a raw byte array into a BASE64 String representation i accordance with RFC 2045. + * @param sArr The bytes to convert. If null or length 0 an empty array will be returned. + * @param lineSep Optional "\r\n" after 76 characters, unless end of file.
+ * No line separator will be in breach of RFC 2045 which specifies max 76 per line but will be a + * little faster. + * @return A BASE64 encoded array. Never null. + */ + public final static String encodeToString(byte[] sArr, boolean lineSep) + { + // Reuse char[] since we can't create a String incrementally anyway and StringBuffer/Builder would be slower. + return new String(encodeToChar(sArr, lineSep)); + } + + /** Decodes a BASE64 encoded String. All illegal characters will be ignored and can handle both strings with + * and without line separators.
+ * Note! It can be up to about 2x the speed to call decode(str.toCharArray()) instead. That + * will create a temporary array though. This version will use str.charAt(i) to iterate the string. + * @param str The source string. null or length 0 will return an empty array. + * @return The decoded array of bytes. May be of length 0. Will be null if the legal characters + * (including '=') isn't divideable by 4. (I.e. definitely corrupted). + */ + public final static byte[] decode(String str) + { + // Check special case + int sLen = str != null ? str.length() : 0; + if (sLen == 0) + return new byte[0]; + + // Count illegal characters (including '\r', '\n') to know what size the returned array will be, + // so we don't have to reallocate & copy it later. + int sepCnt = 0; // Number of separator characters. (Actually illegal characters, but that's a bonus...) + for (int i = 0; i < sLen; i++) // If input is "pure" (I.e. no line separators or illegal chars) base64 this loop can be commented out. + if (IA[str.charAt(i)] < 0) + sepCnt++; + + // Check so that legal chars (including '=') are evenly divideable by 4 as specified in RFC 2045. + if ((sLen - sepCnt) % 4 != 0) + return null; + + // Count '=' at end + int pad = 0; + for (int i = sLen; i > 1 && IA[str.charAt(--i)] <= 0;) + if (str.charAt(i) == '=') + pad++; + + int len = ((sLen - sepCnt) * 6 >> 3) - pad; + + byte[] dArr = new byte[len]; // Preallocate byte[] of exact length + + for (int s = 0, d = 0; d < len;) { + // Assemble three bytes into an int from four "valid" characters. + int i = 0; + for (int j = 0; j < 4; j++) { // j only increased if a valid char was found. + int c = IA[str.charAt(s++)]; + if (c >= 0) + i |= c << (18 - j * 6); + else + j--; + } + // Add the bytes + dArr[d++] = (byte) (i >> 16); + if (d < len) { + dArr[d++]= (byte) (i >> 8); + if (d < len) + dArr[d++] = (byte) i; + } + } + return dArr; + } + + /** Decodes a BASE64 encoded string that is known to be resonably well formatted. The method is about twice as + * fast as {@link #decode(String)}. The preconditions are:
+ * + The array must have a line length of 76 chars OR no line separators at all (one line).
+ * + Line separator must be "\r\n", as specified in RFC 2045 + * + The array must not contain illegal characters within the encoded string
+ * + The array CAN have illegal characters at the beginning and end, those will be dealt with appropriately.
+ * @param s The source string. Length 0 will return an empty array. null will throw an exception. + * @return The decoded array of bytes. May be of length 0. + */ + public final static byte[] decodeFast(String s) + { + // Check special case + int sLen = s.length(); + if (sLen == 0) + return new byte[0]; + + int sIx = 0, eIx = sLen - 1; // Start and end index after trimming. + + // Trim illegal chars from start + while (sIx < eIx && IA[s.charAt(sIx) & 0xff] < 0) + sIx++; + + // Trim illegal chars from end + while (eIx > 0 && IA[s.charAt(eIx) & 0xff] < 0) + eIx--; + + // get the padding count (=) (0, 1 or 2) + int pad = s.charAt(eIx) == '=' ? (s.charAt(eIx - 1) == '=' ? 2 : 1) : 0; // Count '=' at end. + int cCnt = eIx - sIx + 1; // Content count including possible separators + int sepCnt = sLen > 76 ? (s.charAt(76) == '\r' ? cCnt / 78 : 0) << 1 : 0; + + int len = ((cCnt - sepCnt) * 6 >> 3) - pad; // The number of decoded bytes + byte[] dArr = new byte[len]; // Preallocate byte[] of exact length + + // Decode all but the last 0 - 2 bytes. + int d = 0; + for (int cc = 0, eLen = (len / 3) * 3; d < eLen;) { + // Assemble three bytes into an int from four "valid" characters. + int i = IA[s.charAt(sIx++)] << 18 | IA[s.charAt(sIx++)] << 12 | IA[s.charAt(sIx++)] << 6 | IA[s.charAt(sIx++)]; + + // Add the bytes + dArr[d++] = (byte) (i >> 16); + dArr[d++] = (byte) (i >> 8); + dArr[d++] = (byte) i; + + // If line separator, jump over it. + if (sepCnt > 0 && ++cc == 19) { + sIx += 2; + cc = 0; + } + } + + if (d < len) { + // Decode last 1-3 bytes (incl '=') into 1-3 bytes + int i = 0; + for (int j = 0; sIx <= eIx - pad; j++) + i |= IA[s.charAt(sIx++)] << (18 - j * 6); + + for (int r = 16; d < len; r -= 8) + dArr[d++] = (byte) (i >> r); + } + + return dArr; + } +} \ No newline at end of file diff --git a/xwiki-android-test-rest/src/org/xwiki/android/test/rest/TestResources.java b/xwiki-android-test-rest/src/org/xwiki/android/test/rest/TestResources.java index fcde70d..5533d6c 100644 --- a/xwiki-android-test-rest/src/org/xwiki/android/test/rest/TestResources.java +++ b/xwiki-android-test-rest/src/org/xwiki/android/test/rest/TestResources.java @@ -30,7 +30,7 @@ public class TestResources public static final String URL = "10.0.2.2:8080"; - public static final String USERNAME = "Admin"; + public static final String USERNAME = "superadmin"; public static final String PASSWORD = "admin"; diff --git a/xwiki-android-test-rest/src/org/xwiki/android/test/rest/ClassTest.java b/xwiki-android-test-rest/src/org/xwiki/android/test/rest/tstProperties/ClassTest.java similarity index 95% rename from xwiki-android-test-rest/src/org/xwiki/android/test/rest/ClassTest.java rename to xwiki-android-test-rest/src/org/xwiki/android/test/rest/tstProperties/ClassTest.java index 161aaf4..e238628 100644 --- a/xwiki-android-test-rest/src/org/xwiki/android/test/rest/ClassTest.java +++ b/xwiki-android-test-rest/src/org/xwiki/android/test/rest/tstProperties/ClassTest.java @@ -18,11 +18,12 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.xwiki.android.test.rest; +package org.xwiki.android.test.rest.tstProperties; import org.xwiki.android.resources.Class; import org.xwiki.android.resources.Classes; import org.xwiki.android.rest.Requests; +import org.xwiki.android.test.rest.TestResources; import android.test.AndroidTestCase;