From 8dc53357a3b6e7987dcae2da71f83c5150027b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= Date: Mon, 15 Aug 2016 23:31:26 +0200 Subject: [PATCH] Added KeyInfo class --- .../java/me/impy/aegis/ScannerActivity.java | 13 +- .../java/me/impy/aegis/crypto/KeyInfo.java | 42 +++++ .../java/me/impy/aegis/encoding/Base32.java | 147 ++++++++++++++++++ 3 files changed, 199 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/me/impy/aegis/crypto/KeyInfo.java create mode 100644 app/src/main/java/me/impy/aegis/encoding/Base32.java diff --git a/app/src/main/java/me/impy/aegis/ScannerActivity.java b/app/src/main/java/me/impy/aegis/ScannerActivity.java index 00c1936d..6bd21d98 100644 --- a/app/src/main/java/me/impy/aegis/ScannerActivity.java +++ b/app/src/main/java/me/impy/aegis/ScannerActivity.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.List; import me.dm7.barcodescanner.zxing.ZXingScannerView; +import me.impy.aegis.crypto.KeyInfo; public class ScannerActivity extends Activity implements ZXingScannerView.ResultHandler { private ZXingScannerView mScannerView; @@ -26,7 +27,7 @@ public class ScannerActivity extends Activity implements ZXingScannerView.Result mScannerView = new ZXingScannerView(this); // Programmatically initialize the scanner view setContentView(mScannerView); // Set the scanner view as the content view mScannerView.setFormats(getSupportedFormats()); - mScannerView. + ActivityCompat.requestPermissions(ScannerActivity.this, new String[]{Manifest.permission.CAMERA}, 1); } @@ -44,8 +45,14 @@ public class ScannerActivity extends Activity implements ZXingScannerView.Result @Override public void handleResult(Result rawResult) { // Do something with the result here - Log.v("Aegis ", rawResult.getText()); // Prints scan results - Log.v("Aegis ", rawResult.getBarcodeFormat().toString()); // Prints the scan format (qrcode, pdf417 etc.) + Toast.makeText(this, rawResult.getText(), Toast.LENGTH_SHORT).show(); + + try { + KeyInfo info = KeyInfo.FromURL(rawResult.getText()); + + } catch (Exception e) { + e.printStackTrace(); + } // If you would like to resume scanning, call this method below: mScannerView.resumeCameraPreview(this); diff --git a/app/src/main/java/me/impy/aegis/crypto/KeyInfo.java b/app/src/main/java/me/impy/aegis/crypto/KeyInfo.java new file mode 100644 index 00000000..176e796b --- /dev/null +++ b/app/src/main/java/me/impy/aegis/crypto/KeyInfo.java @@ -0,0 +1,42 @@ +package me.impy.aegis.crypto; + +import android.net.Uri; + +import me.impy.aegis.encoding.Base32; + +public class KeyInfo { + private String _type; + private String _label; + private byte[] _secret; + private String _issuer; + private String _algo; + private int _digits; + private long _counter; + private String _period; + + private KeyInfo() { + + } + + public static KeyInfo FromURL(String s) throws Exception { + final Uri url = Uri.parse(s); + + if (!url.getScheme().equals("otpauth")) { + throw new Exception("unsupported protocol"); + } + + KeyInfo info = new KeyInfo(); + info._type = url.getHost(); + + String secret = url.getQueryParameter("secret"); + info._secret = Base32.decode(secret); + info._issuer = url.getQueryParameter("issuer"); + info._label = url.getPath(); + info._algo = url.getQueryParameter("algorithm"); + info._period = url.getQueryParameter("period"); + info._digits = url.getQueryParameter("digits") != null ? Integer.getInteger(url.getQueryParameter("digits")) : 6; + info._counter = url.getQueryParameter("counter") != null ? Long.getLong(url.getQueryParameter("counter")) : 0; + + return info; + } +} diff --git a/app/src/main/java/me/impy/aegis/encoding/Base32.java b/app/src/main/java/me/impy/aegis/encoding/Base32.java new file mode 100644 index 00000000..4cb8dd42 --- /dev/null +++ b/app/src/main/java/me/impy/aegis/encoding/Base32.java @@ -0,0 +1,147 @@ +package me.impy.aegis.encoding; + +/* (PD) 2001 The Bitzi Corporation + * Please see http://bitzi.com/publicdomain for more info. + * + * As modified by Patrick Woodworth: + * + * Copyright 2011 Patrick Woodworth + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.UnsupportedEncodingException; + +/** + * Base32 - encodes and decodes RFC3548 Base32 + * (see http://www.faqs.org/rfcs/rfc3548.html ) + * + * @author Robert Kaye + * @author Gordon Mohr + */ +public class Base32 { + private static final String base32Chars = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; + private static final int[] base32Lookup = + { 0xFF,0xFF,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, // '0', '1', '2', '3', '4', '5', '6', '7' + 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, // '8', '9', ':', ';', '<', '=', '>', '?' + 0xFF,0x00,0x01,0x02,0x03,0x04,0x05,0x06, // '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G' + 0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E, // 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O' + 0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16, // 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W' + 0x17,0x18,0x19,0xFF,0xFF,0xFF,0xFF,0xFF, // 'X', 'Y', 'Z', '[', '\', ']', '^', '_' + 0xFF,0x00,0x01,0x02,0x03,0x04,0x05,0x06, // '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g' + 0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E, // 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o' + 0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16, // 'p', 'q', 'r', 's', 't', 'u', 'v', 'w' + 0x17,0x18,0x19,0xFF,0xFF,0xFF,0xFF,0xFF // 'x', 'y', 'z', '{', '|', '}', '~', 'DEL' + }; + + public static byte[] encode(byte[] data) throws UnsupportedEncodingException { + String lower = encodeOriginal(data).toLowerCase(); + return lower.getBytes("US-ASCII"); + } + + public static byte[] decodeModified(String data) { + return decode(data.replace('8', 'L').replace('9', 'O')); + } + + + /** + * Encodes byte array to Base32 String. + * + * @param bytes Bytes to encode. + * @return Encoded byte array bytes as a String. + * + */ + static public String encodeOriginal(final byte[] bytes) { + int i = 0, index = 0, digit = 0; + int currByte, nextByte; + StringBuffer base32 = new StringBuffer((bytes.length + 7) * 8 / 5); + + while (i < bytes.length) { + currByte = (bytes[i] >= 0) ? bytes[i] : (bytes[i] + 256); // unsign + + /* Is the current digit going to span a byte boundary? */ + if (index > 3) { + if ((i + 1) < bytes.length) { + nextByte = + (bytes[i + 1] >= 0) ? bytes[i + 1] : (bytes[i + 1] + 256); + } else { + nextByte = 0; + } + + digit = currByte & (0xFF >> index); + index = (index + 5) % 8; + digit <<= index; + digit |= nextByte >> (8 - index); + i++; + } else { + digit = (currByte >> (8 - (index + 5))) & 0x1F; + index = (index + 5) % 8; + if (index == 0) + i++; + } + base32.append(base32Chars.charAt(digit)); + } + + return base32.toString(); + } + + /** + * Decodes the given Base32 String to a raw byte array. + * + * @param base32 + * @return Decoded base32 String as a raw byte array. + */ + static public byte[] decode(final String base32) { + int i, index, lookup, offset, digit; + byte[] bytes = new byte[base32.length() * 5 / 8]; + + for (i = 0, index = 0, offset = 0; i < base32.length(); i++) { + lookup = base32.charAt(i) - '0'; + + /* Skip chars outside the lookup table */ + if (lookup < 0 || lookup >= base32Lookup.length) { + continue; + } + + digit = base32Lookup[lookup]; + + /* If this digit is not in the table, ignore it */ + if (digit == 0xFF) { + continue; + } + + if (index <= 3) { + index = (index + 5) % 8; + if (index == 0) { + bytes[offset] |= digit; + offset++; + if (offset >= bytes.length) + break; + } else { + bytes[offset] |= digit << (8 - index); + } + } else { + index = (index + 5) % 8; + bytes[offset] |= (digit >>> index); + offset++; + + if (offset >= bytes.length) { + break; + } + bytes[offset] |= digit << (8 - index); + } + } + return bytes; + } +}