From ca4e2d18f52e202c14a863637386056518496d74 Mon Sep 17 00:00:00 2001
From: "bcoles@gmail.com"
 <bcoles@gmail.com@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Fri, 2 Sep 2011 11:35:20 +0000
Subject: [PATCH] Added Android OS detection from useragent

git-svn-id: https://beef.googlecode.com/svn/trunk@1254 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 core/main/client/os.js                           |   7 +++++++
 core/main/constants/os.rb                        |   4 ++++
 .../admin_ui/media/images/icons/android.png      | Bin 0 -> 3408 bytes
 .../initialization/models/browserdetails.rb      |   1 +
 4 files changed, 12 insertions(+)
 create mode 100644 extensions/admin_ui/media/images/icons/android.png

diff --git a/core/main/client/os.js b/core/main/client/os.js
index 7d153db26..90c39f58c 100644
--- a/core/main/client/os.js
+++ b/core/main/client/os.js
@@ -85,6 +85,10 @@ beef.os = {
 		return (this.ua.match('(Maemo Browser)|(Symbian)|(Nokia)')) ? true : false;
 	},
 
+	isAndroid: function() {
+		return (this.ua.indexOf('Android')) ? true : false;
+	},
+
 	isBlackBerry: function() {
 		return (this.ua.indexOf('BlackBerry')) ? true : false;
 	},
@@ -124,6 +128,9 @@ beef.os = {
 		// BlackBerry
 		if(this.isBlackBerry()) return 'BlackBerry OS';
 
+		// Android
+		if(this.isAndroid()) return 'Android';
+
 		//linux
 		if(this.isLinux()) return 'Linux';
 		if(this.isSunOS()) return 'Sun OS';
diff --git a/core/main/constants/os.rb b/core/main/constants/os.rb
index ed97f9d4a..2014de11d 100644
--- a/core/main/constants/os.rb
+++ b/core/main/constants/os.rb
@@ -31,6 +31,8 @@ module Constants
  	OS_IPHONE_IMG         = 'iphone.png'
 	OS_BLACKBERRY_UA_STR  = 'BlackBerry'
 	OS_BLACKBERRY_IMG     = 'blackberry.png'
+	OS_ANDROID_UA_STR     = 'Android'
+	OS_ANDROID_IMG        = 'android.png'
     OS_ALL_UA_STR         = 'All'
 
 		def self.match_os(name)
@@ -45,6 +47,8 @@ module Constants
 					OS_IPHONE_UA_STR
 				when /blackberry/
 					OS_BLACKBERRY_UA_STR
+				when /android/
+					OS_ANDROID_UA_STR
 				else
 					'ALL'
 				end
diff --git a/extensions/admin_ui/media/images/icons/android.png b/extensions/admin_ui/media/images/icons/android.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c773b558aa7397fa863e98d903762db6a842e9e
GIT binary patch
literal 3408
zcmV-W4X^TvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0007eNkl<Zc-q|8PiRzE6vy$;eU53PL}_gzRtQp|G%3NhB8Y;ZR20;uQjqSIE-EgR
zLP3z0)=i;MXtPqxLezyK#Fd*a1PkIqB?$h>M*K%jX{}BiXWny>JLH*Wl9|ltK!5Ot
zJMZ2(=lkxQbMAQ|%QATlU0kb%7NZ9@&91lc0Y+*q_;URvP*A^0*n@8{A8W7*-Er;?
zF5?DvMB5{?8Epihh^shD)<;+|&6<?#cfu2VQIF9^06xaSOxg#*<Y!fxEFs$%=YGJx
z*^DN2I$wtKm9*5?-8EqAz+n98Wc;LA*}{&cwyip*qp(<(RldfNRssBs-Xs+KJATiN
z`==*%JGTQN%u_1=W8~fmm9!{?1P)+JvjCrB=Y*3)vGmyON5lWw{vddf7TtPqP9-hn
z=l3@Yu<jK{AyG&=r(GBXg?XJ*;XcEnMuM;dhtZEi7{diT)3`!R(JuUm4KXf;qupr%
zzQVycejjJB8c*i{kVHqju{YlP3BCBf7QiRD@q1W~cj7e{y%j5HRg3c96K`HwK7ZQ*
zFsC}uYK3|M3i04+r3x`F>H<hnX)!>Gaw7m~I|2T;L0C6Hcug5FV;1B~ZaM#dHQ}&0
zrL}uH6Tq+dD~?a%QIh}*CfYcE!~pya$7ebXuf_Ij39jS27Ucbdc&zu}VZIdC>Iv`1
ztCew(Mv#WH;CYjd%QF?Tdb;8vd>*&&-S{3*)hNbujm*m2+!!9?)O1hY$PSFgPUfT7
zoaVJXc251+JY{YWAL83~6{4)&l`y;sfTlB~QGmO-@sk*2RsD@WYpiX_yP;UYda((=
mOo{F>?218m1xM>K_;LVE*ptyimQ5l60000<MNUMnLSTYG4PqDo

literal 0
HcmV?d00001

diff --git a/extensions/initialization/models/browserdetails.rb b/extensions/initialization/models/browserdetails.rb
index c107e5ed9..88a91cbbd 100644
--- a/extensions/initialization/models/browserdetails.rb
+++ b/extensions/initialization/models/browserdetails.rb
@@ -105,6 +105,7 @@ module Models
       return BeEF::Core::Constants::Os::OS_IPHONE_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_IPHONE_UA_STR
       return BeEF::Core::Constants::Os::OS_MAC_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_MAC_UA_STR
       return BeEF::Core::Constants::Os::OS_BLACKBERRY_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_BLACKBERRY_UA_STR
+      return BeEF::Core::Constants::Os::OS_ANDROID_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_ANDROID_UA_STR
     
       BeEF::Core::Constants::Os::OS_UNKNOWN_IMG
     end