From f2fdca6a036aef67a9916bc75c06e2dc635acf7b Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 30 Jul 2012 10:17:26 +0200
Subject: [PATCH] Add env var support to CLI.

[ADDED]     The Java CLI client can now take values for the username and
            master password from the environment.
---
 .../masterpassword-algorithm-GIT-SNAPSHOT.jar | Bin 16949 -> 16947 bytes
 .../target/maven-archiver/pom.properties      |   2 +-
 .../lyndir/lhunath/masterpassword/CLI.java    |  61 ++++++++++++------
 .../lyndir/lhunath/masterpassword/CLI.class   | Bin 4416 -> 5071 bytes
 .../masterpassword-algorithm-GIT-SNAPSHOT.jar | Bin 16949 -> 16947 bytes
 .../masterpassword-cli-GIT-SNAPSHOT.jar       | Bin 5363 -> 5699 bytes
 .../target/maven-archiver/pom.properties      |   2 +-
 7 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/MasterPassword/Java/masterpassword-algorithm/target/masterpassword-algorithm-GIT-SNAPSHOT.jar b/MasterPassword/Java/masterpassword-algorithm/target/masterpassword-algorithm-GIT-SNAPSHOT.jar
index 99e5ca3bfa6ad8c6823ebcae9d28764db10e9243..0379ac05dcdfae0f25dd9f75c134bcf88dbb7496 100644
GIT binary patch
delta 582
zcmdnm!nnDGkvG7bnT3l11a1WUo5-ueaXsLlL+;vtZWApVMck(CiP;mwfKUUJoOn*2
z8AN?h15uMD8TG)l7o#nh?qYNS(VH(ax-fzn63o63Mh1%qgt3|RB@b9?zECq0n4v0q
zn*+>XmQ!N}GjtUBSilThRU3$!8ub<2%-4V>s~e{=F#{btd4j1HnBHsZ1EzV*QkesC
zpKdNOt7qZ_DsZTLpmMZz@*j)T`iopm1|kd>zSkaQoj)}*P~nGwU|Is}XZF0jod@qc
z$us`*yXx)FIcq}w1l?30ZguQmU8M7RZ*%mf4UYpp&60ohSMZ#;p~KPBU2D6VKCa8$
zttkHea&U}1^XwDLmrg$W;`yOGKPjy>ete7d(s%+dHYwKFc(#e0l|KIC^#4hV=i1B^
zUXlKdHNcyZNrV|5)|0<ln!p2lvZ0j~$h(vCtn|V30xL5xebdSgOiNk&g6S;l5HNkv
zIulIm+7yB5MK<|hTEsRHOjp<@gXw#=31HgME)`6#w2KAPoc7sZy4*ev6sVJL*js_a
iP}BiJ2RX!m`5PTdL18*s)3F9ANY^<wvOTc`B^m%0QUPxO

delta 584
zcmdno!nn1CkvG7bnT3l11h(yaGLct>W9z;r4w-2}$0u4giX1z(CuUC!144~4P|Z1c
zW)Ss34Ma_rWYh!GUW~S2x{J{TL~p*x=)wqQNHF_C7#S=c5XNTKmpovp`9jT1%oBi$
zRYh-efJK<))R@5x9YsDCFvC{WhKU*Irp-0#E4aZ7b>lQ9W}ssyPcYR2(|b*Qz%-9p
zDzgMoWr<lm6DQCO4#JnbMB69-u}H1o&DCrm((usMU$7u7rzC^5J*aEz1#XoKKd&s2
zI^pUk)SVxHz0dys{L)jJEh|)N*MDK_E>fw^E%j}iW||rrEI%vD-#=YXL%Y03hpYM9
zy0=vmKmY!CQlH<^?MvpnRO^c98CN}fTW3ycwh$F_3bAnJi0_}o;P$ssG4J#KCkbw%
z{Z@X{{s6;~kx7IZ9@>*XTbjUwd$PWj70APrbFB2i^gJswFn!(14opi}`-15V>ku%#
z-#QaaYuglo=><0VU|PsF5lolaCWFFu@*Ud*FyG!T6-+O;iv`o{_SvA|oLp)j2d1yt
lTY*DS*a1QZIK+VY>m5o#p*mUJu?8tn*Elw^J+lNQ8vt-g@$&!x

diff --git a/MasterPassword/Java/masterpassword-algorithm/target/maven-archiver/pom.properties b/MasterPassword/Java/masterpassword-algorithm/target/maven-archiver/pom.properties
index 35d7d212..3c79ce3b 100644
--- a/MasterPassword/Java/masterpassword-algorithm/target/maven-archiver/pom.properties
+++ b/MasterPassword/Java/masterpassword-algorithm/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jul 04 23:49:38 CEST 2012
+#Mon Jul 30 10:06:47 CEST 2012
 version=GIT-SNAPSHOT
 groupId=com.lyndir.lhunath.masterpassword
 artifactId=masterpassword-algorithm
diff --git a/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java b/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java
index 735692bf..a8ead9fd 100644
--- a/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java
+++ b/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java
@@ -18,7 +18,8 @@ package com.lyndir.lhunath.masterpassword;
 import com.google.common.io.LineReader;
 import com.lyndir.lhunath.opal.system.logging.Logger;
 import com.lyndir.lhunath.opal.system.util.ConversionUtils;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.Arrays;
 
 
@@ -30,14 +31,19 @@ import java.util.Arrays;
 public class CLI {
 
     static final Logger logger = Logger.get( CLI.class );
+    private static final String ENV_USERNAME = "MP_USERNAME";
+    private static final String ENV_PASSWORD = "MP_PASSWORD";
 
     public static void main(final String[] args)
             throws IOException {
 
-        InputStream in = System.in;
+        String userName, masterPassword, siteName = null;
+
+        /* Environment. */
+        userName = System.getenv().get( ENV_USERNAME );
+        masterPassword = System.getenv().get( ENV_PASSWORD );
 
         /* Arguments. */
-        String userName = null, siteName = null;
         int counter = 1;
         MPElementType type = MPElementType.GeneratedLong;
         boolean typeArg = false, counterArg = false, userNameArg = false;
@@ -72,6 +78,7 @@ public class CLI {
                 System.out.println( "[options] [site name]" );
                 System.out.println();
                 System.out.println( "Available options:" );
+
                 System.out.println( "\t-t | --type [site password type]" );
                 System.out.format( "\t\tDefault: %s.  The password type to use for this site.\n", type.getName() );
                 System.out.println( "\t\tUse 'list' to see the available types." );
@@ -83,26 +90,44 @@ public class CLI {
 
                 System.out.println();
                 System.out.println( "\t-u | --username [user's name]" );
-                System.out.println( "\t\tDefault: asked.  The name of the current user." );
+                System.out.println( "\t\tDefault: asked.  The name of the user." );
+
+                System.out.println();
+                System.out.println( "Available environment variables:" );
+
+                System.out.format( "\t%s\n", ENV_USERNAME );
+                System.out.println( "\t\tThe name of the user." );
+
+                System.out.format( "\t%s\n", ENV_PASSWORD );
+                System.out.println( "\t\tThe master password of the user." );
 
                 System.out.println();
                 return;
             } else
                 siteName = arg;
-        LineReader lineReader = new LineReader( new InputStreamReader( System.in ) );
-        if (siteName == null) {
-            System.out.print( "Site name: " );
-            siteName = lineReader.readLine();
-        }
-        if (userName == null) {
-            System.out.print( "User's name: " );
-            userName = lineReader.readLine();
-        }
-        System.out.print( "User's master password: " );
-        String masterPassword = lineReader.readLine();
 
-        String sitePassword = MasterPassword.generateContent( type, siteName, MasterPassword.keyForPassword( masterPassword, userName ),
-                                                              counter );
-        System.out.println( sitePassword );
+        InputStreamReader inReader = new InputStreamReader( System.in );
+        try {
+            LineReader lineReader = new LineReader( inReader );
+            if (siteName == null) {
+                System.err.format( "Site name: " );
+                siteName = lineReader.readLine();
+            }
+            if (userName == null) {
+                System.err.format( "User's name: " );
+                userName = lineReader.readLine();
+            }
+            if (masterPassword == null) {
+                System.err.format( "%s's master password: ", userName );
+                masterPassword = lineReader.readLine();
+            }
+
+            byte[] masterKey = MasterPassword.keyForPassword( masterPassword, userName );
+            String sitePassword = MasterPassword.generateContent( type, siteName, masterKey, counter );
+            System.out.println( sitePassword );
+        }
+        finally {
+            inReader.close();
+        }
     }
 }
diff --git a/MasterPassword/Java/masterpassword-cli/target/classes/com/lyndir/lhunath/masterpassword/CLI.class b/MasterPassword/Java/masterpassword-cli/target/classes/com/lyndir/lhunath/masterpassword/CLI.class
index cf9ce4d41d5713a3158bcdd8ea63b5fa45e899f4..e982f7d6567c01109626ccd8bb42e0d9d4015761 100644
GIT binary patch
delta 2648
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
SIZ|Djo6Mt_`#5s~Ti*o(I8>wn

delta 2061
zcmY+Ed303u6~{lnH_Q9IH!qM(2rxj%7!o1CkOVZ~ppAkEfh<5kNCoXMjxi9DkeRqp
z+Od{ayJ)S?Eo%4DsjappX@^17Vrgr^wo<#IwHs}<?P)#z!*guQ!QM9vQO|kj-ut`1
z?_J;T-WTQ`t<9b|`{XmgV*YMZ&Y;B*dn|@Y+hiCCaT7O(xP@Cive)GOnte8!4`@E9
z$$H{#p3R3ex0`%e)1%pM^ASF3i<3J%a;HZ=W((-!p7aULCpCB3+|8%N!#$c$Ywp#!
zp4EMt`#t`E=0VLvno-TennyH`YCfa+tj*{6yygp<FKWJI@@10)HcfoRrjeZHtDf~^
z-r;MSuWKH+d4g|v<eMhnvN_0@MVxU(uz#?(H|5r-i^m^Svy_`uRqnVk&7JA1c4s=(
zmL5r`hC36xQ|?CJYWIZE?5^}xtZ>qOnbi73I(_rt@b!wa?o1-Nt0OVADY2tJWzuc(
zZE2FpcTDmo>m)&iz3P@^YADk;IFL3u<i6>v&$e>8Nx@+gn+5A|m^PCq9ggsn$<q$c
z@Lh4>aFk~qzQ-{|`Od^miN^lKKyPDrX1H&lS7F354&UboQcEnBxpgR|@b~wnMfpRX
zbNCU*C3gLirgU^)v_5UW!-sp+KYiH=hv)gR!%z6B!wZ~r_?bsu<mV2*;Fq5Nq{52D
zl7k}ynbfe!uN;2OZ`|@gZOthzS4^=w5^1@Ko^MEWWqX^$DP9`i5SXEYFFX8}SKK|p
z9@XSNADmO392p)?4P>HTYZobM+*3x4yUm=vwUysFwDNmJs9PEw9gx1qqYi)IC5Jz9
zQaZg^Z04p*H;U<{^X_vQ43&OKJZkbMhtvGo;V=BvJ!3Z1@~XpY{LSGq-lM22HnMN9
zv29>zBqO~{C3d^by32h)&l#_>f<9yVJof^p%I$Jy2LnUW>WsU``G<<RkCnxO3SVz3
z<KA1gCL5P|0m;PkE0RxS`L9B+kW-^@B|I?y5bB@^1}lUHi^|!o6xlfk;7V4>$>J(j
z3rdXr%LO-COd7{9+Es_@^tbrO@WlhZmY}c2^tI^ug&p`06Hvshh;<lAY*ZcaBvZ+&
z(Q!L$MeIEG!<2<XMQIev-xAEJeO19x(qYF_mW{G)j7j0ifu||&@r5h8d;H;Wcb>{E
z1*W+Fo-`vnaT%GEr%LWUKD7whU#4<zz33}2En*j#UQ92i%y48P@{G45n>qejWsXwr
zVQ04ZrH&jghi6S-tKY`z9M4wiQ6$G~hg6$mJUn{>SW^N%Dw*erdih_Fr`F?hO1$nI
zFWuIcv=^56Tz|3JNWd$|tJO1|_b!u$5_Ep{9Jb0|V8H}-;k&T05_Zvq_F%;B%$?nG
zgvOpDH1)_|JVf&$7RRmFb5wZImgKo8V&%EGb74u-a$eKn-7h_V%Es+TAQrI~7Fgyb
zaY;NR_mPmq@?Mp%_^STJa*^xtGfx(B10m+i<6J<5g|h5obh1cRO(Q+BDU&p_SN8q=
zEMZJ|fs1&Gr5s}!$GL=8#NxF0dyPwZoy)SkAyZ?~swT_GPvHtRjTNezm8zL5)lyce
zR<2U3S);mWQ=3_<wzE#9XjgmbP`A^i?qt2XhYjig8`TqRQsZn^N4Q!YW2-t&k2=9M
z>LlCLX|}6ZxmLZ-b?OZg>Obr-6xpO<k}@W9gE5sGjSJanEMix2e)5E+ifY!-#w4<m
z`&!mX?fa#ob~<Ff?vPqLMJgk%T)J3~O`UpNbQ@&eWWLx)w{*^LEbvyb%wy1K;A+7c
zXk#v0Sf7;^hm1P5iW@)WMvXMFjR2L#EZ)mCGN@CH2-`$5iAajuMbc7BJJ)g@mS`fp
z&kHQ6TO>pZu|q<xrSdK6uuYOC*Gq}=DU%zN650!AXb?@{Y%hyVZdB?`ntV=WprSHR
zR{1|3`Y(ojXQ(sjt6-;BgJi!;{(k?&3aTyc7qBad7g#>drQVBC@7P08Iqepm!NC6k
D`GdBg

diff --git a/MasterPassword/Java/masterpassword-cli/target/lib/masterpassword-algorithm-GIT-SNAPSHOT.jar b/MasterPassword/Java/masterpassword-cli/target/lib/masterpassword-algorithm-GIT-SNAPSHOT.jar
index 99e5ca3bfa6ad8c6823ebcae9d28764db10e9243..0379ac05dcdfae0f25dd9f75c134bcf88dbb7496 100644
GIT binary patch
delta 582
zcmdnm!nnDGkvG7bnT3l11a1WUo5-ueaXsLlL+;vtZWApVMck(CiP;mwfKUUJoOn*2
z8AN?h15uMD8TG)l7o#nh?qYNS(VH(ax-fzn63o63Mh1%qgt3|RB@b9?zECq0n4v0q
zn*+>XmQ!N}GjtUBSilThRU3$!8ub<2%-4V>s~e{=F#{btd4j1HnBHsZ1EzV*QkesC
zpKdNOt7qZ_DsZTLpmMZz@*j)T`iopm1|kd>zSkaQoj)}*P~nGwU|Is}XZF0jod@qc
z$us`*yXx)FIcq}w1l?30ZguQmU8M7RZ*%mf4UYpp&60ohSMZ#;p~KPBU2D6VKCa8$
zttkHea&U}1^XwDLmrg$W;`yOGKPjy>ete7d(s%+dHYwKFc(#e0l|KIC^#4hV=i1B^
zUXlKdHNcyZNrV|5)|0<ln!p2lvZ0j~$h(vCtn|V30xL5xebdSgOiNk&g6S;l5HNkv
zIulIm+7yB5MK<|hTEsRHOjp<@gXw#=31HgME)`6#w2KAPoc7sZy4*ev6sVJL*js_a
iP}BiJ2RX!m`5PTdL18*s)3F9ANY^<wvOTc`B^m%0QUPxO

delta 584
zcmdno!nn1CkvG7bnT3l11h(yaGLct>W9z;r4w-2}$0u4giX1z(CuUC!144~4P|Z1c
zW)Ss34Ma_rWYh!GUW~S2x{J{TL~p*x=)wqQNHF_C7#S=c5XNTKmpovp`9jT1%oBi$
zRYh-efJK<))R@5x9YsDCFvC{WhKU*Irp-0#E4aZ7b>lQ9W}ssyPcYR2(|b*Qz%-9p
zDzgMoWr<lm6DQCO4#JnbMB69-u}H1o&DCrm((usMU$7u7rzC^5J*aEz1#XoKKd&s2
zI^pUk)SVxHz0dys{L)jJEh|)N*MDK_E>fw^E%j}iW||rrEI%vD-#=YXL%Y03hpYM9
zy0=vmKmY!CQlH<^?MvpnRO^c98CN}fTW3ycwh$F_3bAnJi0_}o;P$ssG4J#KCkbw%
z{Z@X{{s6;~kx7IZ9@>*XTbjUwd$PWj70APrbFB2i^gJswFn!(14opi}`-15V>ku%#
z-#QaaYuglo=><0VU|PsF5lolaCWFFu@*Ud*FyG!T6-+O;iv`o{_SvA|oLp)j2d1yt
lTY*DS*a1QZIK+VY>m5o#p*mUJu?8tn*Elw^J+lNQ8vt-g@$&!x

diff --git a/MasterPassword/Java/masterpassword-cli/target/masterpassword-cli-GIT-SNAPSHOT.jar b/MasterPassword/Java/masterpassword-cli/target/masterpassword-cli-GIT-SNAPSHOT.jar
index d480811dfb3f2003319b0f5fad8d7356d95313af..f45ec0a9eda4d5bd2bc080f7c7355dd56d8f97ea 100644
GIT binary patch
delta 3537
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
S1s=l=#LscDpLgc?b^Cw&UuF*g

delta 3199
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

diff --git a/MasterPassword/Java/masterpassword-cli/target/maven-archiver/pom.properties b/MasterPassword/Java/masterpassword-cli/target/maven-archiver/pom.properties
index 516b7511..3c5a4273 100644
--- a/MasterPassword/Java/masterpassword-cli/target/maven-archiver/pom.properties
+++ b/MasterPassword/Java/masterpassword-cli/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jul 04 23:49:39 CEST 2012
+#Mon Jul 30 10:06:48 CEST 2012
 version=GIT-SNAPSHOT
 groupId=com.lyndir.lhunath.masterpassword
 artifactId=masterpassword-cli