Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Base.lproj/Main.storyboard.iqiyi
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Base.lproj/Main.storyboard.iqiyi (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Base.lproj/Main.storyboard.iqiyi (working copy)
@@ -0,0 +1,3604 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Base.lproj/Main.storyboard.zrt
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Base.lproj/Main.storyboard.zrt (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Base.lproj/Main.storyboard.zrt (working copy)
@@ -0,0 +1,3604 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ANTabBarController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ANTabBarController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ANTabBarController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// ANTabBarController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface ANTabBarController : UITabBarController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ANTabBarController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ANTabBarController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ANTabBarController.m (working copy)
@@ -0,0 +1,35 @@
+//
+// ANTabBarController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANTabBarController.h"
+
+@interface ANTabBarController ()
+
+@end
+
+@implementation ANTabBarController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ NSDictionary *selectedDict = @{NSForegroundColorAttributeName: MAIN_COLOR};
+ NSDictionary *unselectedDict = @{NSForegroundColorAttributeName: UIColorFromRGBA(0x666666, 1.0)};
+ for (UITabBarItem *item in self.tabBar.items) {
+ [item setTitleTextAttributes:unselectedDict forState:UIControlStateNormal];
+ [item setTitleTextAttributes:selectedDict forState:UIControlStateSelected];
+ }
+ self.tabBar.tintColor = MAIN_COLOR;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AboutViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AboutViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AboutViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// AboutViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/11.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface AboutViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AboutViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AboutViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AboutViewController.m (working copy)
@@ -0,0 +1,209 @@
+//
+// AboutViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/11.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "UIDevice+Hardware.h"
+#import "AboutViewController.h"
+#import "GatewayManager.h"
+#import "ANPopupDialog.h"
+#import "Global.h"
+
+static NSInteger const kVersionCellIndex = 0;
+static NSInteger const kCopyrightCellIndex = 1;
+static NSInteger const kDeviceIDCellIndex = 2;
+static NSInteger const kVersionLabelTag = 1;
+static NSInteger const kCopyrightLabelTag = 1;
+static NSInteger const kDeviceIDLabelTag = 1;
+static NSInteger const kCheckUpdateButtonTag = 2;
+
+static NSString * const kVersionCellID = @"VersionCellID";
+static NSString * const kCopyrightCellID = @"CopyrightCellID";
+static NSString * const kDeviceIDCellID = @"DeviceIDCellID";
+
+@interface AboutViewController ()
+
+@property (weak, nonatomic) IBOutlet UIImageView *imageView;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (nonatomic) BOOL needUpdate;
+@property (strong, nonatomic) NSString *lastClientVersion;
+
+@end
+
+@implementation AboutViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self initImageView];
+}
+
+- (void)viewDidLayoutSubviews {
+ // Move copyright label upwards for iPhone5s/iPhoneSE.
+ if ([[UIDevice currentDevice] isIphone5]) {
+ NSIndexPath *copyrightIndexPath = [NSIndexPath indexPathForRow:kCopyrightCellIndex inSection:0];
+ UITableViewCell *copyrightCell = [self.tableView cellForRowAtIndexPath:copyrightIndexPath];
+ if (copyrightCell) {
+ UILabel *copyrightLabel = [copyrightCell viewWithTag:kCopyrightLabelTag];
+ if (copyrightLabel) {
+ CGRect originalFrame = copyrightLabel.frame;
+ copyrightLabel.frame = CGRectMake(originalFrame.origin.x, originalFrame.origin.y-4, originalFrame.size.width, originalFrame.size.height);
+ }
+ }
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)initImageView {
+ self.imageView.layer.masksToBounds = YES;
+ self.imageView.layer.cornerRadius = 5;
+}
+
+- (NSString *)loadVersionInfo {
+ NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
+ return [infoDictionary objectForKey:@"CFBundleShortVersionString"];
+}
+
+- (NSString *)loadBuildInfo {
+ NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
+ return [infoDictionary objectForKey:@"CFBundleVersion"];
+}
+
+- (NSString *)loadDeviceID {
+ return [AAAManager sharedInstance].deviceID;
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return 3;
+}
+
+- (void)checkUpdateButtonClicked:(id)sender {
+ if (_needUpdate) {
+ //__weak typeof(self) weakSelf = self;
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:_lastClientVersion
+ message:NSLocalizedString(@"A new version is detected. Do you want to install?", nil)
+ confirmAction:^{
+ ANInfo(@"user confirm update");
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ NSString *downloadURL = [gatewayManager getClientDownloadURL];
+ if ([downloadURL length] <= 0) {
+ downloadURL = @"http://app.arraynetworks.com.cn/motionproplus";
+ }
+ OpenURL([NSURL URLWithString:downloadURL]);
+ }
+ cancelAction:^{
+ ANInfo(@"user cancel update");
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ } else {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:_lastClientVersion message:NSLocalizedString(@"The current version is the latest version.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ if (indexPath.row == kVersionCellIndex) {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kVersionCellID];
+ UILabel *versionLabel = [cell viewWithTag:kVersionLabelTag];
+ if (versionLabel != nil) {
+ NSString *version = [self loadVersionInfo];
+ NSString *build = [self loadBuildInfo];
+ versionLabel.text = [NSString stringWithFormat:@"%@ Build %@", version, build];
+
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ _lastClientVersion = [gatewayManager getLastClientVersion];
+ ANInfo(@"local motionpro version:%@, last motionpro version=%@.", version, _lastClientVersion);
+ _needUpdate = NO;
+ if ([_lastClientVersion compare:version options:NSNumericSearch] == NSOrderedDescending) {
+ ANInfo(@"motionpro need update.");
+ _needUpdate = YES;
+ }
+
+ UIButton *checkUpdateButton = (UIButton *)[cell viewWithTag:kCheckUpdateButtonTag];
+ if ([_lastClientVersion length] <= 0) {
+ checkUpdateButton.hidden = YES;
+ } else {
+ checkUpdateButton.hidden = NO;
+ }
+
+ [checkUpdateButton addTarget:self action:@selector(checkUpdateButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+ } else if (indexPath.row == kCopyrightCellIndex) {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kCopyrightCellID];
+ UILabel *copyrightLabel = [cell viewWithTag:kCopyrightLabelTag];
+ if (copyrightLabel != nil) {
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ formatter.dateFormat = @"YYYY";
+ NSString *year = [formatter stringFromDate:[NSDate date]];
+ copyrightLabel.text = [NSString stringWithFormat:@"©2014-%@ Array Networks Inc. All rights reserved.", year];
+ }
+ } else if (indexPath.row == kDeviceIDCellIndex) {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kDeviceIDCellID];
+ UILabel *deviceIDLabel = [cell viewWithTag:kDeviceIDLabelTag];
+ if (deviceIDLabel) {
+ deviceIDLabel.text = [self loadDeviceID];
+ }
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.row == kDeviceIDCellIndex && indexPath.section == 0) {
+ [self showCopyMenu];
+ }
+}
+
+// Copy menu for deviceID
+- (BOOL)canBecomeFirstResponder { // To show menu.
+ return YES;
+}
+
+- (void)showCopyMenu {
+ NSIndexPath *deviceIDCellIndexPath = [NSIndexPath indexPathForRow:kDeviceIDCellIndex inSection:0];
+ UITableViewCell *deviceIDCell = [self.tableView cellForRowAtIndexPath:deviceIDCellIndexPath];
+ if (deviceIDCell) {
+ UILabel *deviceIDLabel = [deviceIDCell viewWithTag:kDeviceIDLabelTag];
+ if (deviceIDLabel) {
+ [self becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *copyItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Copy", nil) action:@selector(customCopy:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:copyItem, nil]];
+ [controller setTargetRect:deviceIDCell.contentView.frame inView:deviceIDCell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+ }
+ }
+}
+
+- (void)customCopy:(id)sender {
+ NSIndexPath *deviceIDCellIndexPath = [NSIndexPath indexPathForRow:kDeviceIDCellIndex inSection:0];
+ UITableViewCell *deviceIDCell = [self.tableView cellForRowAtIndexPath:deviceIDCellIndexPath];
+ if (deviceIDCell) {
+ UILabel *deviceIDLabel = [deviceIDCell viewWithTag:kDeviceIDLabelTag];
+ UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
+ pasteboard.string = deviceIDLabel.text;
+
+ ANDebug(@"Pasted string: %@", pasteboard.string);
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AccessModeSelectViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AccessModeSelectViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AccessModeSelectViewController.h (working copy)
@@ -0,0 +1,23 @@
+//
+// AcsModeViewController.h
+// MotionProPlus
+//
+// Created by wangxy on 2019/7/23.
+// Copyright © 2019 wangxy. All rights reserved.
+//
+
+#import
+
+@protocol AcsModeSelectControllerDelegate
+
+- (void)didFinishSelect:(NSString *)selectAcsDesc;
+
+@end
+
+
+@interface AccessModeSelectViewController : UITableViewController
+
+@property (weak, nonatomic) id delegate;
+@property (nonatomic, strong) NSString *selectedAcsModeString;
+@end
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AccessModeSelectViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AccessModeSelectViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/AccessModeSelectViewController.m (working copy)
@@ -0,0 +1,169 @@
+//
+// AcsModeViewController.m
+// MotionProPlus
+//
+// Created by wangxy on 2019/7/23.
+// Copyright © 2019 wangxy. All rights reserved.
+//
+#import "Global.h"
+#import "ANLogger.h"
+#import "AccessModeSelectViewController.h"
+#import "AccessModeSelectCell.h"
+#import "AAAManager.h"
+
+
+static NSString * const kAcsModeStoryBoardID = @"AcsModeViewControllerID";
+static NSString * const AccessModeSelectCellID = @"AccessModeSelectCellID";
+
+@interface AccessModeSelectViewController ()
+
+@property (nonatomic, strong) NSArray *acsDescList;
+@property (nonatomic, strong) NSString *selectAcsDesc;
+
+@end
+
+@implementation AccessModeSelectViewController
+
+@synthesize selectedAcsModeString;
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self registerCells];
+ [self initAccessModeInfo];
+}
+
+- (void)registerCells {
+ [self.tableView registerClass:[AccessModeSelectCell class] forCellReuseIdentifier: AccessModeSelectCellID];
+}
+
+- (void)initAccessModeInfo {
+ self.acsDescList = [AAAManager sharedInstance].acsModeDesc;
+
+ BOOL bSelectAllMode = NO;
+ if (self.selectedAcsModeString == nil) {
+ bSelectAllMode = YES;
+ }
+ NSArray *cells = [self cellsForTableView:self.tableView];
+ for (AccessModeSelectCell *cell in cells) {
+ if (bSelectAllMode) {
+ [cell showSelectView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ if ([self.selectedAcsModeString isEqualToString:[cell getCellText]]) {
+ [cell showSelectView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ [cell showSelectView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ }
+ }
+ }
+}
+
+- (IBAction)cancelButtonClicked:(id)sender {
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)saveButtonClicked:(id)sender {
+ NSArray *cells = [self cellsForTableView:self.tableView];
+ NSString *acsSelectedDesc = nil;
+ for (AccessModeSelectCell *cell in cells) {
+ if ([cell isSelectCell]) {
+ acsSelectedDesc = [cell getCellText];
+ }
+ }
+
+ __weak typeof(self) weakSelf = self;
+ [self dismissViewControllerAnimated:YES completion:^{
+ [weakSelf.delegate didFinishSelect:acsSelectedDesc];
+ }];
+}
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+ if (cell == nil) {
+ continue;
+ }
+ [cells addObject:cell];
+ }
+ }
+ return cells;
+}
+
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return self.acsDescList.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+ NSString *acsDesc = [self.acsDescList objectAtIndex:row];
+
+ AccessModeSelectCell *accessModeCell = [[AccessModeSelectCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:AccessModeSelectCellID];
+
+
+ [accessModeCell configureCellWithMessage:acsDesc isDescList:YES];
+
+ return accessModeCell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return self.acsDescList.count + 1;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ AccessModeSelectCell *cell = (AccessModeSelectCell *)[tableView cellForRowAtIndexPath:indexPath];
+ self.selectAcsDesc = [cell getCellText];
+ ANInfo(@"select acs desc=%@", self.selectAcsDesc);
+
+ NSArray *cells = [self cellsForTableView:tableView];
+ for (AccessModeSelectCell *cell in cells) {
+ if (cell == (AccessModeSelectCell *)[tableView cellForRowAtIndexPath:indexPath]) {
+ [cell showSelectView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ [cell showSelectView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ }
+ }
+}
+
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ if ([self.selectAcsDesc length] <= 0 && [self.selectedAcsModeString length] <= 0) {
+ return;
+ }
+ AccessModeSelectCell* acsCell = (AccessModeSelectCell *)(cell);
+ if ([acsCell.getCellText isEqualToString:self.selectAcsDesc] || [acsCell.getCellText isEqualToString:self.selectedAcsModeString]) {
+ [acsCell showSelectView:YES];
+ [acsCell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ [acsCell showSelectView:NO];
+ [acsCell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ }
+}
+
+
+@end
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h (working copy)
@@ -0,0 +1,15 @@
+//
+// CertificateInstallViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+NSString * const kAppGroupDesc = @"group.net.arraynetworks.MotionProPlus";
+
+@interface CertificateInstallViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.InfosecEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.InfosecEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.InfosecEnterprise (working copy)
@@ -0,0 +1,15 @@
+//
+// CertificateInstallViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+NSString * const kAppGroupDesc = @"group.net.infosec.groupenterprise";
+
+@interface CertificateInstallViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.InfosecStore
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.InfosecStore (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.InfosecStore (working copy)
@@ -0,0 +1,15 @@
+//
+// CertificateInstallViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+NSString * const kAppGroupDesc = @"group.net.infosec.MotionPro";
+
+@interface CertificateInstallViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.MotionPro
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.MotionPro (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.MotionPro (working copy)
@@ -0,0 +1,15 @@
+//
+// CertificateInstallViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+NSString * const kAppGroupDesc = @"group.net.arraynetworks.MotionPro";
+
+@interface CertificateInstallViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.MotionProEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.MotionProEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.h.MotionProEnterprise (working copy)
@@ -0,0 +1,15 @@
+//
+// CertificateInstallViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+NSString * const kAppGroupDesc = @"group.net.arraynetworks.groupenterprise";
+
+@interface CertificateInstallViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificateInstallViewController.m (working copy)
@@ -0,0 +1,459 @@
+//
+// CertificateInstallViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "CertificateManager.h"
+#import "UIViewController+HideKeyboard.h"
+#import "CertificateInstallViewController.h"
+#import "SelectCell.h"
+#import "ANImageButton.h"
+#import "ActionSheetPicker.h"
+
+
+@interface CertificateInstallViewController ()
+
+@property (weak, nonatomic) IBOutlet UITextField *addressTextField;
+@property (weak, nonatomic) IBOutlet UIButton *installButton;
+
+@property (weak, nonatomic) IBOutlet UITableView *localCertTableView;
+@property (weak, nonatomic) IBOutlet ANImageButton *urlSelectButton;
+@property (weak, nonatomic) IBOutlet ANImageButton *localSelectButton;
+
+@property (nonatomic, strong) UIAlertController *passCheck;
+@property (nonatomic, strong) UIAlertController *nameCheck;
+@property (nonatomic, strong) UIAlertController *retryView;
+
+@property (nonatomic, strong) NSString *currentAddCertPath;
+@property (nonatomic, strong) NSArray *localCertNameList;
+@property (nonatomic, strong) NSString *certNameSelected;
+
+@property (nonatomic, strong) NSMutableData *cert;
+@property (nonatomic, strong) NSURLConnection *connection;
+@property (nonatomic, strong) NSHTTPURLResponse *resp;
+
+@property (nonatomic) BOOL isURLSelected;
+
+@end
+
+@implementation CertificateInstallViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+ [self initButtonAppearance];
+
+ self.cert = [[NSMutableData alloc] initWithCapacity:10];
+
+ [self.localCertTableView registerNib:[UINib nibWithNibName:@"SelectCell" bundle:nil] forCellReuseIdentifier:kSelectCellID];
+ self.localCertTableView.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0,0,0,0.01)];
+ self.isURLSelected = YES;
+ [self setSelectType:YES];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ self.addressTextField.text = [self lastUrlString];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)initButtonAppearance {
+ self.installButton.layer.cornerRadius = 2.5;
+ self.installButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.installButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.installButton.layer.shadowOpacity = 0.25;
+}
+
+- (IBAction)closeButtonClicked:(id)sender {
+ [self closeConnection];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)urlSelecteButtonClicked:(id)sender {
+ if (![self isURLSelected]) {
+ self.isURLSelected = YES;
+ [self setSelectType:YES];
+ }
+}
+
+- (IBAction)localSelecteButtonClicked:(id)sender {
+ if ([self isURLSelected]) {
+ self.isURLSelected = NO;
+ [self setSelectType:NO];
+ }
+}
+
+- (void)configCertLabel:(NSString *)name {
+}
+
+- (IBAction)installButtonClicked:(id)sender {
+ if ([self isURLSelected]) {
+ [self.addressTextField resignFirstResponder];
+
+ [self closeConnection];
+
+ NSString *urlString = [self.addressTextField.text stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+ NSURL *url = [NSURL URLWithString:urlString];
+ [self saveLastUrlString:self.addressTextField.text];
+
+ if (![url.scheme isEqualToString:@"http"] && ![url.scheme isEqualToString:@"https"] && ![url.scheme isEqualToString:@"ftp"]) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"The url you input is incorrect. Please input another one.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ }
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:url];
+ self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
+
+ [self.connection start];
+ [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
+ } else {
+ if ([self.certNameSelected length] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"There is no certificate. Please import a new one.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ }
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupDesc];
+ NSData *data = [userDefaults valueForKey:self.certNameSelected];
+ if (data == nil) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"The import fails due to the missing certificate content.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ }
+
+ [self.cert appendData:data];
+ [self installCertificate];
+ }
+}
+
+- (void)getLocalCertMsg {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupDesc];
+ NSString *localListString = [userDefaults valueForKey:@"cert_list"];
+ self.localCertNameList = [localListString componentsSeparatedByCharactersInSet:
+ [NSCharacterSet characterSetWithCharactersInString:@","]];
+ ANInfo(@"Import Certificate from share extension, current cert list[%@].", self.localCertNameList);
+}
+
+- (void)setSelectType:(BOOL)isSelectURL {
+ UIImage *imageSelected = [UIImage imageNamed:@"CertificateSelected"];
+ UIImage *imageUnSelected = [UIImage imageNamed:@"CertificateUnselected"];
+ if (isSelectURL) {
+ [self.urlSelectButton setImage:imageSelected forState:UIControlStateNormal];
+ [self.urlSelectButton setImage:imageSelected forState:UIControlStateHighlighted];
+ [self.localSelectButton setImage:imageUnSelected forState:UIControlStateNormal];
+ [self.localSelectButton setImage:imageUnSelected forState:UIControlStateHighlighted];
+ self.localCertTableView.userInteractionEnabled = NO;
+ self.localCertTableView.alpha=0.4;
+ self.addressTextField.userInteractionEnabled = YES;
+ self.addressTextField.alpha=1;
+ } else {
+ [self.urlSelectButton setImage:imageUnSelected forState:UIControlStateNormal];
+ [self.urlSelectButton setImage:imageUnSelected forState:UIControlStateHighlighted];
+ [self.localSelectButton setImage:imageSelected forState:UIControlStateNormal];
+ [self.localSelectButton setImage:imageSelected forState:UIControlStateHighlighted];
+ self.localCertTableView.userInteractionEnabled = YES;
+ self.localCertTableView.alpha=1;
+ self.addressTextField.userInteractionEnabled = NO;
+ self.addressTextField.alpha=0.4;
+ }
+}
+
+- (void)closeConnection {
+ if (self.connection) {
+ [self.connection cancel];
+ self.connection = nil;
+ }
+}
+
+- (void)saveLastUrlString:(NSString *)string {
+ NSString *url = string;
+ if (url) {
+ [[NSUserDefaults standardUserDefaults] setObject:url forKey:@"lasturl"];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+ }
+}
+
+- (NSString *)lastUrlString {
+ NSString * url = [[NSUserDefaults standardUserDefaults] objectForKey:@"lasturl"];
+ return url;
+}
+
+#pragma mark - NSURLConnectionDataDelegate
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
+ [self.cert setLength:0];
+ if ([response isMemberOfClass:[NSHTTPURLResponse class]]) {
+ self.resp = (NSHTTPURLResponse *)response;
+ }
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
+ [self.cert appendData:data];
+}
+
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+ ANError(@"Download cert failed with error %@", error);
+
+ [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Can't connect to the server", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
+ [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+ if (self.resp && self.resp.statusCode != 200) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"File not found. Please make sure the url is right.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ self.resp = nil;
+
+ return;
+ }
+
+ [self installCertificate];
+}
+
+- (void)installCertificate {
+ __weak typeof(self) weakSelf = self;
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ weakSelf.passCheck = nil;
+ weakSelf.nameCheck = nil;
+ }];
+ UIAlertAction *OKAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ UITextField *field = [weakSelf.passCheck.textFields objectAtIndex:0];
+ if ([self alertView:weakSelf.passCheck check:field.text]) {
+ [self alertView:weakSelf.passCheck dismissOnSuccess:YES];
+ return;
+ } else {
+ NSString *message = NSLocalizedString(@"Password wrong", nil);
+ weakSelf.passCheck.title = message;
+
+ [weakSelf presentViewController:weakSelf.passCheck animated:YES completion:nil];
+ }
+ }];
+ self.passCheck = [self alertInputView:NSLocalizedString(@"Password", nil)
+ style:UIAlertViewStyleSecureTextInput
+ actions:@[cancelAction, OKAction]];
+
+ NSString *fullpath;
+ NSDateFormatter *fmt = [[NSDateFormatter alloc] init];
+ fmt.dateFormat = @"yyyy-MM-dd_HH_mm_ss";
+ fullpath = [fmt stringFromDate:[NSDate date]];
+
+ fullpath = [[[CertificateManager sharedInstance] certsDirectory] stringByAppendingPathComponent:fullpath];
+ fullpath = [fullpath stringByAppendingPathExtension:@"p12"];
+
+ [self.cert writeToFile:fullpath atomically:YES];
+ self.currentAddCertPath = fullpath;
+
+ [self presentViewController:self.passCheck animated:YES completion:nil];
+}
+
+- (void)alertView:(UIAlertController *)alert dismissOnSuccess:(BOOL)success {
+ // Success is equal to NO means user cancel
+ if (success) {
+ if(alert == self.passCheck) {
+ //show the check name alert
+ __weak typeof(self) weakSelf = self;
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:nil];
+ UIAlertAction *OKAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ UITextField *field = [weakSelf.nameCheck.textFields objectAtIndex:0];
+ if ([self alertView:weakSelf.nameCheck check:field.text]) {
+ [self alertView:weakSelf.nameCheck dismissOnSuccess:YES];
+ return;
+ } else {
+ NSString *message = nil;
+ NSString *name = weakSelf.nameCheck.textFields[0].text;
+ if (name.length == 0) {
+ message = NSLocalizedString(@"Name can not be empty", nil);
+ } else {
+ message = NSLocalizedString(@"Name already exists", nil);
+ }
+ weakSelf.nameCheck.title = message;
+
+ [weakSelf presentViewController:weakSelf.nameCheck animated:YES completion:nil];
+ }
+ }];
+ self.nameCheck = [self alertInputView:NSLocalizedString(@"Certificate name",nil)
+ style:UIAlertViewStylePlainTextInput
+ actions:@[cancelAction, OKAction]];
+
+ [self presentViewController:self.nameCheck animated:YES completion:nil];
+ } else {
+ //add success
+ [[CertificateManager sharedInstance] save];
+ self.passCheck = nil;
+ self.nameCheck = nil;
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+ } else {
+ self.passCheck = nil;
+ self.nameCheck = nil;
+ }
+}
+
+- (BOOL)alertView:(UIAlertController *)alert check:(NSString *)string {
+ static Certificate *currentCert;
+
+ if (alert == self.passCheck) {
+ currentCert = [[Certificate alloc] initWithP12Path:self.currentAddCertPath pass:string];
+ if (currentCert == nil) {
+ return NO;
+ } else {
+ return YES;
+ }
+ } else if (alert == self.nameCheck) {
+ string = [string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+ BOOL isExisted = [[CertificateManager sharedInstance].certificates objectForKey:string] != nil;
+ if (string.length != 0 && !isExisted && currentCert != nil) {
+ [[CertificateManager sharedInstance].certificates setObject:currentCert forKey:string];
+ return YES;
+ }
+
+ }
+
+ return NO;
+}
+
+- (UIAlertController *)alertInputView:(NSString *)title style:(UIAlertViewStyle)style actions:(NSArray *)actions {
+ UIAlertController *controller = [UIAlertController alertControllerWithTitle:title
+ message:nil
+ preferredStyle:UIAlertControllerStyleAlert];
+
+ if (style == UIAlertViewStylePlainTextInput) {
+ [controller addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Please input certificate name", nil);
+ }];
+ } else if (style == UIAlertViewStyleSecureTextInput) {
+ [controller addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Please input certificate password", nil);
+ textField.secureTextEntry = YES;
+ }];
+ }
+
+ for (UIAlertAction *action in actions) {
+ [controller addAction:action];
+ }
+
+ return controller;
+}
+
+// trust https site
+- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
+ [challenge.sender useCredential:[NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust] forAuthenticationChallenge:challenge];
+}
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ [cells addObject:[tableView cellForRowAtIndexPath:indexPath]];
+ }
+ }
+ return cells;
+}
+
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ SelectCell *cell = [self.localCertTableView dequeueReusableCellWithIdentifier:kSelectCellID];
+ if (!cell) {
+ cell = [[SelectCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kSelectCellID];
+ }
+ NSString *desc = NSLocalizedString(@"Select Local Certificate", nil);
+ if ([self.localCertNameList count] > 1) {
+ self.certNameSelected = [self.localCertNameList objectAtIndex:0];
+ [cell configureCellWithMessage:desc Info:[self.localCertNameList objectAtIndex:0]];
+ } else {
+ [cell configureCellWithMessage:desc Info:nil];
+ }
+
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [self getLocalCertMsg];
+ [self.localCertTableView deselectRowAtIndexPath:indexPath animated:YES];
+ if ([self.localCertNameList count] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"There is no certificate. Please import a new one.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ }
+
+ NSArray *cells = [self cellsForTableView:self.localCertTableView];
+ if ([cells count] == 1) {
+ SelectCell *cell = (SelectCell *)[cells objectAtIndex:0];
+
+ [ActionSheetStringPicker showPickerWithTitle:nil
+ rows:self.localCertNameList
+ initialSelection:0
+ doneBlock:^(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue) {
+ cell.infoText.text = selectedValue;
+ cell.descText.text = nil;
+ self.certNameSelected = selectedValue;
+ }
+ cancelBlock:^(ActionSheetStringPicker *picker) {
+
+ }
+ origin:cell];
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return 44;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificatesViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificatesViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificatesViewController.h (working copy)
@@ -0,0 +1,22 @@
+//
+// CertificatesViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@protocol CertificateChangeDelegate
+
+- (void)certificateDidSelectedWithName:(NSString *)name;
+
+@end
+
+@interface CertificatesViewController : UITableViewController
+
+@property (nonatomic, copy) NSString *selectedCertName;
+@property (nonatomic, weak) id delegate;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificatesViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificatesViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CertificatesViewController.m (working copy)
@@ -0,0 +1,175 @@
+//
+// CertificatesViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/23.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "CertificateNameCell.h"
+#import "CertificateManager.h"
+#import "CertificatesViewController.h"
+
+typedef NS_ENUM(NSInteger, CertificateRowIndex) {
+ kCertificateRowIndexName,
+ kCertificateRowIndexSubject,
+ kCertificateRowIndexIssuer,
+ kCertificateRowIndexExpires
+};
+
+static NSInteger const kTotalRowsInSection = 4;
+
+static NSInteger const kLabelTag = 1;
+
+static NSString * const kNameCellID = @"CertificateNameID";
+static NSString * const kSubjectCellID = @"CertificateSubjectID";
+static NSString * const kIssuerCellID = @"CertificateIssuerID";
+static NSString * const kExpiresCellID = @"CertificateExpireID";
+
+@interface CertificatesViewController ()
+
+@property (nonatomic, strong) NSArray *certNames;
+
+@end
+
+@implementation CertificatesViewController
+
+@synthesize certNames = _certNames;
+
+- (void)dealloc {
+ self.certNames = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [self.tableView reloadData];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (NSArray *)certNames {
+ NSArray *allKeys = [[CertificateManager sharedInstance].certificates allKeys];
+
+ _certNames = [allKeys sortedArrayUsingComparator:^(NSString * str1, NSString * str2) {
+ return [str1 compare:str2];
+ }];
+
+ return _certNames;
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return self.certNames.count;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return kTotalRowsInSection;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger section = indexPath.section;
+ NSInteger row = indexPath.row;
+ UITableViewCell *cell = nil;
+ NSString *certName = [self.certNames objectAtIndex:section];
+ Certificate *cert = [[CertificateManager sharedInstance] certificateWithName:certName];
+
+ switch (row) {
+ case kCertificateRowIndexName: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kNameCellID];
+ CertificateNameCell *nameCell = (CertificateNameCell *)cell;
+ nameCell.nameLabel.text = certName;
+ nameCell.delegate = self;
+ if ([self.selectedCertName isEqualToString:certName]) {
+ [nameCell setAsSelected];
+ } else {
+ [nameCell setAsUnselected];
+ }
+ break;
+ }
+ case kCertificateRowIndexSubject: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kSubjectCellID];
+ UILabel *label = [cell viewWithTag:kLabelTag];
+ label.text = cert.subjectCN;
+ break;
+ }
+ case kCertificateRowIndexIssuer: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kIssuerCellID];
+ UILabel *label = [cell viewWithTag:kLabelTag];
+ label.text = cert.issuer;
+ break;
+ }
+ case kCertificateRowIndexExpires: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kExpiresCellID];
+ UILabel *label = [cell viewWithTag:kLabelTag];
+ label.text = cert.expireTime;
+ break;
+ }
+
+ default:
+ ANError(@"Invalid row index of (%zi) received, can't alloc valid cell.", row);
+
+ cell = [[UITableViewCell alloc] init]; // Prevent from crash.
+ break;
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15.0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - CertificateCellDelegate
+- (void)selectedButtonDidClickedWithCell:(UITableViewCell *)cell isSelected:(BOOL)isSelected {
+ if (isSelected) {
+ for (UITableViewCell *aCell in self.tableView.visibleCells) {
+ if ([aCell isKindOfClass:[CertificateNameCell class]] && aCell != cell) {
+ CertificateNameCell *nameCell = (CertificateNameCell *)aCell;
+ [nameCell setAsUnselected];
+ }
+ }
+
+ self.selectedCertName = ((CertificateNameCell *)cell).nameLabel.text;
+ } else {
+ self.selectedCertName = @"";
+ }
+
+ [self.delegate certificateDidSelectedWithName:self.selectedCertName];
+}
+
+- (void)deleteButtonDidClickedWithCell:(UITableViewCell *)cell {
+ CertificateNameCell *nameCell = (CertificateNameCell *)cell;
+
+ NSIndexPath *indexPath = [self.tableView indexPathForCell:nameCell];
+ if (!indexPath) {
+ ANError(@"Certificate cell named '%@' has not been found.", nameCell.nameLabel.text);
+ return;
+ }
+
+ if ([nameCell.nameLabel.text isEqualToString:self.selectedCertName]) {
+ self.selectedCertName = @"";
+ [self.delegate certificateDidSelectedWithName:self.selectedCertName];
+ }
+
+ [[CertificateManager sharedInstance] removeCertForName:nameCell.nameLabel.text];
+
+ NSMutableIndexSet *indexSet = [[NSMutableIndexSet alloc] init];
+ [indexSet addIndex:indexPath.section];
+ [self.tableView deleteSections:indexSet withRowAnimation:UITableViewRowAnimationFade];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChallengeViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChallengeViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChallengeViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// ChallengeViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/28.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface ChallengeViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChallengeViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChallengeViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChallengeViewController.m (working copy)
@@ -0,0 +1,163 @@
+//
+// ChallengeViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/28.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "AAAManager.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "ChallengeViewController.h"
+
+#define TOTAL_SECTIONS 1
+#define TOTAL_ROWS 1
+
+static NSString * const kPasswordCellID = @"ChallengePasswordCell";
+static NSInteger const kTextFieldCellTag = 1;
+static NSInteger kPasswordCellSection = 0;
+static NSInteger kPasswordCellRow = 0;
+
+@interface ChallengeViewController ()
+
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@end
+
+@implementation ChallengeViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+ [self initButtonAppearance];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)initButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+- (void)login {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ account.dynamicCode = [self getPasswordTextField].text;
+
+ [manager continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (UITextField *)getPasswordTextField {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:kPasswordCellRow inSection:kPasswordCellSection];
+ UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
+
+ return (UITextField *)[cell viewWithTag:kTextFieldCellTag];
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ [self login];
+}
+
+- (IBAction)cancelButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
++ (NSString *)parseInformation {
+ static NSDictionary *_msgs;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ _msgs = @{
+ @"\\n Enter your new PIN, conta": @"Enter your new PIN, containing 4 to 8 chars.",
+ @"\\n Please re-e": @"Please re-enter new PIN:",
+ @"\\nPINs do not match. Please tr": @"PINs do not match. Please try again.",
+ @"\\n\\nPIN rejected. Please try a": @"PIN rejected. Please try again.",
+ @"\\n\\nWait for the code on your ": @"Wait for the code on your card to change, then log in with the new PIN. Enter PASSCODE:",
+ @"\\nAccess Denied\\n\\n\\nEnter PAS": @"Access Denied. Enter PASSCODE:",
+ };
+ });
+
+ vpn_challenge_info_t *info = [AAAManager sharedInstance].challenge_info;
+ if (!info) {
+ return nil;
+ }
+
+ NSString *information = [NSString stringWithUTF8String:info->info];
+ NSLog(@"information: %@", information);
+
+ if (!information || information.length <= 0) return nil;
+
+ if (information.length < 30) return information;
+
+ NSString *token = [information substringToIndex:30];
+ NSString *finalString = _msgs[token];
+
+ if (!finalString) return information;
+
+ return finalString;
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ NSInteger section = indexPath.section;
+ NSInteger row = indexPath.row;
+ if (section == kPasswordCellSection && row == kPasswordCellRow) {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kPasswordCellID];
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 30.0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+ UITableViewHeaderFooterView *headerView = [[UITableViewHeaderFooterView alloc] init];
+ return headerView;
+}
+
+- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section {
+ if (section != 0) return;
+
+ if ([view isKindOfClass:[UITableViewHeaderFooterView class]]) {
+ UITableViewHeaderFooterView *tableViewHeaderFooterView = (UITableViewHeaderFooterView *) view;
+ tableViewHeaderFooterView.textLabel.text = [[self class] parseInformation];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChangePasswordViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChangePasswordViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChangePasswordViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// ChangePasswordViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/16.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface ChangePasswordViewController : UITableViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChangePasswordViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChangePasswordViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ChangePasswordViewController.m (working copy)
@@ -0,0 +1,112 @@
+//
+// ChangePasswordViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/16.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "AAAManager.h"
+#import "ANPopupDialog.h"
+#import "UIViewController+HideKeyboard.h"
+#import "ChangePasswordViewController.h"
+
+#define TOTAL_SECTIONS 1
+#define TOTAL_ROWS 2
+
+typedef NS_ENUM(NSInteger, ChangePasswordCellIndex) {
+ kChangePasswordCellIndexMethod,
+ kChangePasswordCellIndexNewPassword,
+ kChangePasswordCellIndexConfirmPassword
+};
+
+@interface ChangePasswordViewController ()
+
+@property (weak, nonatomic) IBOutlet UITextField *passwordTextField;
+@property (weak, nonatomic) IBOutlet UITextField *confirmPasswordTextField;
+
+@end
+
+@implementation ChangePasswordViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self enableHideKeyboard];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)changeButtonClicked:(id)sender {
+ if ([self.passwordTextField.text isEqualToString:@""] || [self.confirmPasswordTextField.text isEqualToString:@""]) {
+ NSString *message = NSLocalizedString(@"Please input password!", nil);
+ [self promptMessage:message];
+ return;
+ } else if (![self.passwordTextField.text isEqualToString:self.confirmPasswordTextField.text]) {
+ NSString *message = NSLocalizedString(@"Please check your password!", nil);
+ [self promptMessage:message];
+ return;
+ } else if ([self.confirmPasswordTextField.text length] > 32) {
+ NSString *message = NSLocalizedString(@"Password length should be less than 32 characters!", nil);
+ [self promptMessage:message];
+ return;
+ }
+
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ account.passWord = self.passwordTextField.text;
+
+ [manager continueVPNThreadWithAccount:account];
+
+ [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (IBAction)cancelLogin:(id)sender {
+ [[AAAManager sharedInstance] cancelLogin];
+
+ [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (void)promptMessage:(NSString *)message {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15.0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.passwordTextField) {
+ [self.passwordTextField resignFirstResponder];
+ [self.confirmPasswordTextField becomeFirstResponder];
+ } else if (textField == self.confirmPasswordTextField) {
+ [self.confirmPasswordTextField resignFirstResponder];
+ }
+
+ return YES;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ClientVerificationBase.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ClientVerificationBase.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ClientVerificationBase.h (working copy)
@@ -0,0 +1,19 @@
+//
+// ClientVerificationBase.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/13/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+#import "ANLogger.h"
+
+@interface ClientVerificationBase : NSObject
+
+@property (nonatomic, retain) NSMutableArray *objectsMutableArray;
+@property (nonatomic, retain) ClientVerificationBase *currentObject;
+- (void)pushCurrentObject;
+- (BOOL)takeAction;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ClientVerificationBase.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ClientVerificationBase.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ClientVerificationBase.m (working copy)
@@ -0,0 +1,49 @@
+//
+// ClientVerificationBase.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/13/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "ClientVerificationBase.h"
+
+@implementation ClientVerificationBase
+
+@synthesize currentObject = _currentObject;
+@synthesize objectsMutableArray = _objectsMutableArray;
+
+- (NSMutableArray *)objectsMutableArray {
+ if (_objectsMutableArray == nil) {
+ _objectsMutableArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _objectsMutableArray;
+}
+
+- (void)pushObject:(id)aObject {
+ if (aObject == nil) {
+ return;
+ }
+
+ [self.objectsMutableArray addObject:aObject];
+}
+
+- (void)pushCurrentObject {
+ [self pushObject:self.currentObject];
+}
+
+- (BOOL)takeAction {
+ ANDebug(@"%@ %@", self, NSStringFromSelector(_cmd));
+
+ __block BOOL ret;
+ [self.objectsMutableArray enumerateObjectsUsingBlock:^(ClientVerificationBase *obj, NSUInteger idx, BOOL *stop) {
+ *stop = ![obj takeAction];
+ ret = !(*stop);
+ }];
+
+ return ret;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Condition.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Condition.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Condition.h (working copy)
@@ -0,0 +1,17 @@
+//
+// Condition.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/12/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+#import "ClientVerificationBase.h"
+#import "ConditionEval.h"
+
+@interface Condition : ClientVerificationBase
+
+@property (nonatomic, retain) ConditionEval *eval;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Condition.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Condition.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Condition.m (working copy)
@@ -0,0 +1,46 @@
+//
+// Condition.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/12/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "Condition.h"
+#import "ConditionCase.h"
+
+@implementation Condition
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ ConditionCase *conditionCase = [self conditionCaseMatchEval];
+ [conditionCase takeAction];
+
+ return YES;
+}
+
+- (ConditionCase *)conditionCaseMatchEval {
+ // find the ConditionCase that its value equals Condition.eval, otherwise find the default one
+ int idx = 0, idxDefault = -1;
+ BOOL isMacthed;
+ for (ConditionCase *conditionCase in self.objectsMutableArray) {
+ if ([self.eval isMatchValue:conditionCase.caseValue]) {
+ isMacthed = YES;
+ return conditionCase;
+ } else {
+ if ([conditionCase isDefaultCase]) {
+ idxDefault = idx;
+ }
+ }
+ idx++;
+ }
+
+ if (idxDefault != -1) {
+ return [self.objectsMutableArray objectAtIndex:idxDefault];
+ } else {
+ return nil;
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionCase.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionCase.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionCase.h (working copy)
@@ -0,0 +1,19 @@
+//
+// ConditionCase.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/13/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "ClientVerificationBase.h"
+
+@interface ConditionCase : ClientVerificationBase
+
+@property (nonatomic, retain) NSDictionary *attrDict;
+@property (nonatomic, readonly) NSString *caseValue;
+@property (nonatomic, readonly) BOOL isDefaultCase;
+
+-(id) initWithDict:(NSDictionary *)dict;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionCase.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionCase.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionCase.m (working copy)
@@ -0,0 +1,42 @@
+//
+// ConditionCase.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/13/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "ConditionCase.h"
+#import "RuleAction.h"
+
+@implementation ConditionCase
+
+#define RULE_COND_CASE_ATTR_VALUE @"Value"
+#define RULE_COND_CASE_ATTR_DEFAULT @"Default"
+
+@synthesize attrDict = _attrDict;
+
+- (NSString *)caseValue {
+ return [self.attrDict objectForKey:RULE_COND_CASE_ATTR_VALUE];
+}
+
+- (BOOL)isDefaultCase {
+ NSString *defaultValue = [self.attrDict objectForKey:RULE_COND_CASE_ATTR_DEFAULT];
+ return [[defaultValue lowercaseString] isEqualToString:@"true"];
+}
+
+- (BOOL)takeAction {
+ ANInfo(@"foreach RuleAction, take action");
+
+ return [super takeAction];
+}
+
+- (id)initWithDict:(NSDictionary *)dict {
+ self = [super init];
+ if (self) {
+ self.attrDict = dict;
+ }
+
+ return self;
+}
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionEval.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionEval.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionEval.h (working copy)
@@ -0,0 +1,60 @@
+//
+// ConditionEval.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/21/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+
+@interface ConditionEval : NSObject
+
+@property (nonatomic, retain) NSString *paramContent;
+@property (nonatomic, retain) NSString *insideValue;
+
+- (BOOL)isMatchValue:(NSString *)value;
+
+@end
+
+@interface ConditionEvalOSType : ConditionEval
+@end
+
+@interface ConditionEvalParam : ConditionEval
+@end
+
+@interface ConditionEvalOSVersion : ConditionEval
+@end
+
+@interface ConditionEvalTimeOfDay : ConditionEval
+@end
+
+@interface ConditionEvalMemberOf : ConditionEval
+@end
+
+@interface ConditionEvalNetworkType : ConditionEval
+@end
+
+@interface ConditionEvalWifiSSID : ConditionEval
+@end
+
+@interface ConditionEvalDeviceIDState : ConditionEval
+@end
+
+@interface ConditionEvalPasscodeOn : ConditionEval
+@end
+
+@interface ConditionEvalAppInstalled : ConditionEval
+@end
+
+@interface ConditionEvalManufacturer : ConditionEval
+@end
+
+@interface ConditionEvalNonSignedApps : ConditionEval
+@end
+
+@interface ConditionEvalIOSType : ConditionEval
+@end
+
+@interface ConditionEvalJailbroken : ConditionEval
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionEval.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionEval.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/ConditionEval.m (working copy)
@@ -0,0 +1,159 @@
+//
+// ConditionEval.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/21/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "ConditionEval.h"
+#import "Reachability.h"
+#import
+#import
+
+@implementation ConditionEval
+
+@synthesize paramContent = _paramContent;
+@synthesize insideValue = _insideValue;
+
+- (BOOL)isMatchValue:(NSString *)value {
+ if ([[value lowercaseString] isEqualToString:self.insideValue]) {
+ return YES;
+ }
+
+ return NO;
+}
+
+@end
+
+@implementation ConditionEvalOSType
+
+- (NSString *)insideValue {
+ return @"ios";
+}
+
+@end
+
+@implementation ConditionEvalParam
+
+- (NSString *)insideValue {
+ return self.paramContent;
+}
+
+@end
+
+@implementation ConditionEvalOSVersion
+
+-(NSString *)insideValue {
+ NSString *iOSVersion = [[UIDevice currentDevice] systemVersion];
+ return iOSVersion;
+}
+
+@end
+
+@implementation ConditionEvalTimeOfDay
+@end
+
+@implementation ConditionEvalMemberOf
+@end
+
+@implementation ConditionEvalNetworkType
+
+- (NSString *)insideValue {
+ NetworkStatus reachabilityWiFiStatus = [[Reachability reachabilityForLocalWiFi] currentReachabilityStatus];
+ if (reachabilityWiFiStatus == ReachableViaWiFi) {
+ return @"wifi";
+ } else {
+ NetworkStatus reachabilityCellStatus = [[Reachability reachabilityForInternetConnection] currentReachabilityStatus];
+ if (reachabilityCellStatus == ReachableViaWWAN) {
+ return @"cell";
+ }
+ }
+
+ return @"unknow";
+}
+
+- (BOOL)isMatchValue:(NSString *)value {
+ if ([[value lowercaseString] isEqualToString:self.insideValue]) {
+ return YES;
+ }
+
+ return NO;
+}
+
+@end
+
+@implementation ConditionEvalWifiSSID
+
+- (NSString *)insideValue {
+ CFArrayRef myArray1 = CNCopySupportedInterfaces();
+ CFDictionaryRef myDict = CNCopyCurrentNetworkInfo(CFArrayGetValueAtIndex(myArray1, 0));
+ NSDictionary *SSIDDict = (__bridge NSDictionary *)myDict;
+ NSString *ssid = (NSString *)[SSIDDict objectForKey:@"SSID"];
+ return ssid;
+}
+
+@end
+
+@implementation ConditionEvalDeviceIDState
+@end
+
+@implementation ConditionEvalPasscodeOn
+@end
+
+@implementation ConditionEvalAppInstalled
+
+- (NSString *)insideValue {
+ BOOL canOpenApp = [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@://", self.paramContent]]];
+ if (canOpenApp) {
+ return @"true";
+ } else {
+ return @"false";
+ }
+
+ return @"false";
+}
+
+@end
+
+@implementation ConditionEvalManufacturer
+
+- (NSString *)insideValue {
+ return @"apple";
+}
+
+@end
+
+@implementation ConditionEvalNonSignedApps
+@end
+
+@implementation ConditionEvalIOSType
+
+- (NSString *)insideValue {
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ return @"ipad";
+ } else if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+ return @"iphone";
+ } else
+ return @"unknow";
+}
+
+@end
+
+@implementation ConditionEvalJailbroken
+
+- (BOOL)isDeviceJailbroken {
+ return [[NSFileManager defaultManager] fileExistsAtPath: @"/bin/bash"];
+}
+
+- (NSString *)insideValue {
+ if ([self isDeviceJailbroken]) {
+ return @"true";
+ } else
+ return @"false";
+}
+
+@end
+
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Rule.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Rule.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Rule.h (working copy)
@@ -0,0 +1,32 @@
+//
+// Rule.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/10/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+#import "RuleTrigger.h"
+#import "Condition.h"
+#import "ClientVerificationBase.h"
+
+enum {
+ RULE_TRIGGER_NUMBER_NONE = -1,
+ RULE_TRIGGER_NUMBER_PRELOGIN,
+ RULE_TRIGGER_NUMBER_POSTLOGIN,
+ RULE_TRIGGER_NUMBER_TIMMER
+};
+
+@interface Rule : ClientVerificationBase
+
+@property (nonatomic, retain) RuleTrigger *trigger;
+@property (nonatomic, retain) NSString *name;
+
+- (BOOL)isTimerRule;
+- (BOOL)isPreRule;
+- (BOOL)isPostRule;
+
+- (BOOL)stopTimer;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Rule.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Rule.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/Rule.m (working copy)
@@ -0,0 +1,98 @@
+//
+// Rule.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/10/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "Rule.h"
+#import "RulesManager.h"
+
+@interface Rule ()
+
+@property (nonatomic, retain) NSTimer *ruleTimer;
+
+@end
+
+@implementation Rule
+
+@synthesize trigger = _trigger;
+@synthesize name = _name;
+
+- (BOOL)isTimerRule {
+ if ([self.trigger isMemberOfClass:[RuleTriggerTimer class]]) {
+ return YES;
+ }
+
+ return NO;
+}
+
+- (BOOL)isPreRule {
+ if ([self.trigger isMemberOfClass:[RuleTriggerPreLogin class]]) {
+ return YES;
+ }
+
+ return NO;
+}
+
+- (BOOL)isPostRule {
+ if ([self.trigger isMemberOfClass:[RuleTriggerPostLogin class]]) {
+ return YES;
+ }
+
+ return NO;
+}
+
+- (BOOL)takeAction {
+ ANDebug(@"%@ %@", self, NSStringFromSelector(_cmd));
+ ANDebug(@"%@", self.objectsMutableArray);
+
+ if ([self isTimerRule]) {
+ RuleTriggerTimer *trigTimer = (RuleTriggerTimer *)self.trigger;
+ NSDate *fireDate = [NSDate dateWithTimeIntervalSinceNow:[trigTimer startTime]];
+ NSTimeInterval timeInterval = [trigTimer timeInterval];
+
+ ANDebug(@"%@ %f", fireDate, timeInterval);
+
+ self.ruleTimer = [[NSTimer alloc] initWithFireDate:fireDate
+ interval:timeInterval
+ target:self
+ selector:@selector(handleTimerRule)
+ userInfo:nil repeats:YES];
+
+ [[NSRunLoop mainRunLoop] addTimer:self.ruleTimer forMode:NSDefaultRunLoopMode];
+
+ ANInfo(@"Clientverification timer start");
+
+ return YES;
+ } else {
+ ANInfo(@"Clientverification start");
+ return [super takeAction];
+ }
+}
+
+- (void)handleTimerRule {
+ ANDebug(@"%@", NSStringFromSelector(_cmd));
+
+ [[RulesManager sharedInstance] cleanTimerRuleInteraction];
+
+ [self.objectsMutableArray enumerateObjectsUsingBlock:^(Condition *obj, NSUInteger idx, BOOL *stop) {
+ *stop = ![obj takeAction];
+ }];
+
+ usleep(50000);
+
+ [[RulesManager sharedInstance] didTrigTimer];
+}
+
+- (BOOL)stopTimer {
+ if (self.ruleTimer != nil) {
+ [self.ruleTimer invalidate];
+ }
+
+ return YES;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleAction.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleAction.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleAction.h (working copy)
@@ -0,0 +1,64 @@
+//
+// RuleAction.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/13/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+#import
+#import "ClientVerificationBase.h"
+
+@protocol RuleActionUserInteractionProtocol
+
+#define KEYPATH_RAUIP_IS_READY @"isReady"
+
+@property (nonatomic, assign) BOOL isReady;
+@property (nonatomic, strong) UIAlertView *alert;
+
+-(BOOL) performAction;
+
+@end
+
+@interface RuleAction : ClientVerificationBase
+
+@property (nonatomic, retain) NSString *message;
+@property (nonatomic, retain) NSDictionary *attrDict;
+
+@property (nonatomic, assign) BOOL isTimerRuleAction;
+
+- (id)initWithDict:(NSDictionary *)dict;
+- (id)initWithDict:(NSDictionary *)dict isTimerType:(BOOL)isTimerType;
+- (id)initWithTimerType:(BOOL)isTimerType;
+
+@end
+
+@interface RuleActionLog : RuleAction
+@end
+
+@interface RuleActionTermsess : RuleAction
+@end
+
+@interface RuleActionAlertUser : RuleAction
+@end
+
+@interface RuleActionPromptUser : RuleAction
+@end
+
+@interface RuleActionUserInput : RuleAction
+@end
+
+@interface RuleActionSetParam : RuleAction
+@end
+
+@interface RuleActionEndRule : RuleAction
+@end
+
+@interface RuleActionTriggerRule : RuleAction
+@end
+
+@interface RuleActionAssignGroup : RuleAction
+@end
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleAction.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleAction.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleAction.m (working copy)
@@ -0,0 +1,315 @@
+//
+// RuleAction.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/13/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "arrayapi.h"
+#import "ANLogger.h"
+#import "RuleAction.h"
+#import "RulesManager.h"
+
+#define ANLOG_DEBUG 0
+#define ANLOG_INFO 1
+#define ANLOG_WARNING 2
+#define ANLOG_ERROR 3
+
+#define ARRAYVPN_AUDIT_LOG_ID_CV2_LOGACTION 1001
+#define ARRAYVPN_AUDIT_LOG_ID_CV2_PROMPTUSERACTION 1002
+
+@implementation RuleAction
+
+@synthesize message = _message;
+@synthesize attrDict = _attrDict;
+@synthesize isTimerRuleAction = _isTimerRuleAction;
+
+- (id)initWithDict:(NSDictionary *)dict {
+ self = [super init];
+ if (self) {
+ self.attrDict = dict;
+ self.isTimerRuleAction = NO;
+ }
+
+ return self;
+}
+
+- (id)initWithDict:(NSDictionary *)dict isTimerType:(BOOL)isTimerType {
+ self = [super init];
+ if (self) {
+ self.attrDict = dict;
+ self.isTimerRuleAction = isTimerType;
+ }
+
+ return self;
+}
+
+- (id)initWithTimerType:(BOOL)isTimerType {
+ self = [super init];
+ if (self) {
+ self.isTimerRuleAction = isTimerType;
+ }
+
+ return self;
+}
+@end
+
+@implementation RuleActionLog
+
+#define RULE_ACTION_LOG_ATTR_PRIORITY @"Priority"
+#define RULE_ACTION_LOG_LEVEL_WARNING @"Warning"
+#define RULE_ACTION_LOG_LEVEL_ERROR @"Critical"
+
+- (BOOL)takeAction {
+ // send log with priority
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ NSString *logString = [NSString stringWithFormat:@"Client Verification: %@", self.message];
+ NSString *priority = [self.attrDict objectForKey:RULE_ACTION_LOG_ATTR_PRIORITY];
+
+ int level = AUDIT_INFO;
+ int mpLevel = ANLOG_INFO;
+
+ if (NSOrderedSame == [priority compare:RULE_ACTION_LOG_LEVEL_WARNING] ) {
+ level = AUDIT_WARNING;
+ mpLevel = ANLOG_WARNING;
+ } else if (NSOrderedSame == [priority compare:RULE_ACTION_LOG_LEVEL_ERROR]) {
+ level = AUDIT_CRIT;
+ mpLevel = ANLOG_ERROR;
+ }
+
+ array_vpn_audit_log(level, ARRAYVPN_AUDIT_LOG_ID_CV2_LOGACTION, (char *)[logString UTF8String]);
+
+ switch (mpLevel) {
+ case ANLOG_DEBUG:
+ ANDebug(@"%@", logString);
+ break;
+ case ANLOG_INFO:
+ ANInfo(@"%@", logString);
+ break;
+ case ANLOG_WARNING:
+ ANWarn(@"%@", logString);
+ break;
+ case ANLOG_ERROR:
+ ANError(@"%@", logString);
+ break;
+
+ default:
+ break;
+ }
+
+ return YES;
+}
+
+@end
+
+@implementation RuleActionTermsess
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance] runIntoEndSessionRule:self.isTimerRuleAction];
+ });
+
+ ANInfo(@"clientverification end session");
+
+ return YES;
+}
+
+@end
+
+@implementation RuleActionAlertUser
+
+@synthesize alert = _alert;
+@synthesize isReady;
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ [[RulesManager sharedInstance] addRuleActionIntoUserInteractionArray:self];
+
+ ANInfo(@"clientverification alert users");
+
+ return YES;
+}
+
+- (BOOL)performAction {
+ __weak typeof(self) weakSelf = self;
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ weakSelf.alert = [[UIAlertView alloc] initWithTitle:@"" message:self.message delegate:nil cancelButtonTitle:NSLocalizedString(@"OK",nil) otherButtonTitles:nil, nil];
+ weakSelf.alert.delegate = self;
+ [weakSelf.alert show];
+ });
+
+ return YES;
+}
+
+#pragma mark - UIAlertView Delegate
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
+ ANInfo(@"isReady: %@", NSStringFromSelector(_cmd));
+ self.isReady = YES;
+}
+
+- (void)dealloc {
+ _alert.delegate = nil;
+}
+
+@end
+
+@interface RuleActionPromptUser ()
+#define RULE_ACTION_PROMPTUSER_ATTR_OPT_1 @"Option1"
+#define RULE_ACTION_PROMPTUSER_ATTR_OPT_2 @"Option2"
+#define RULE_ACTION_PROMPTUSER_ATTR_LOGTXT @"LogTxt"
+#define RULE_ACTION_PROMPTUSER_ATTR_PARAM @"Param"
+@end
+
+@implementation RuleActionPromptUser
+
+@synthesize isReady;
+@synthesize alert = _alert;
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ [[RulesManager sharedInstance] addRuleActionIntoUserInteractionArray:self];
+ ANInfo(@"clientverification prompt user action");
+
+ return YES;
+}
+
+- (BOOL)performAction {
+ NSString *titleOfButton1 = [self.attrDict objectForKey:RULE_ACTION_PROMPTUSER_ATTR_OPT_1];
+ NSString *titleOfButton2 = [self.attrDict objectForKey:RULE_ACTION_PROMPTUSER_ATTR_OPT_2];
+
+ __weak typeof(self) weakSelf = self;
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ weakSelf.alert = [[UIAlertView alloc] initWithTitle:@"" message:self.message delegate:self cancelButtonTitle:titleOfButton1 otherButtonTitles:titleOfButton2, nil];
+ [weakSelf.alert show];
+ });
+
+ return YES;
+}
+
+- (void)dealloc {
+ _alert.delegate = nil;
+}
+
+#pragma mark - UIAlertView Delegate
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
+ ANDebug(@"isReady: %@", NSStringFromSelector(_cmd));
+
+ NSString *titleOfButton1 = [self.attrDict objectForKey:RULE_ACTION_PROMPTUSER_ATTR_OPT_1];
+ NSString *titleOfButton2 = [self.attrDict objectForKey:RULE_ACTION_PROMPTUSER_ATTR_OPT_2];
+ NSString *logTxt = [self.attrDict objectForKey:RULE_ACTION_PROMPTUSER_ATTR_LOGTXT];
+ NSString *selectedTitle;
+ if (buttonIndex == 0) {
+ selectedTitle = titleOfButton1;
+ } else {
+ selectedTitle = titleOfButton2;
+ }
+
+ NSString *logString = [NSString stringWithFormat:@"Client Verification: %@ %@", logTxt, selectedTitle];
+ array_vpn_audit_log(AUDIT_INFO, ARRAYVPN_AUDIT_LOG_ID_CV2_PROMPTUSERACTION, (char *)[logString UTF8String]);
+
+ ANInfo(@"%@ %@", logTxt, selectedTitle);
+
+ self.isReady = YES;
+}
+
+@end
+
+@interface RuleActionUserInput ()
+@end
+
+@implementation RuleActionUserInput
+
+@synthesize isReady;
+@synthesize alert = _alert;
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ [[RulesManager sharedInstance] addRuleActionIntoUserInteractionArray:self];
+
+ ANInfo(@"Client verification user input action");
+
+ return YES;
+}
+
+- (BOOL)performAction {
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.alert = [[UIAlertView alloc] initWithTitle:self.message message:nil delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"OK", nil];
+ weakSelf.alert.alertViewStyle = UIAlertViewStylePlainTextInput;
+ weakSelf.alert.delegate = self;
+ [weakSelf.alert show];
+ });
+
+ return YES;
+}
+
+- (void)dealloc {
+ _alert.delegate = nil;
+}
+
+#pragma mark - UIAlertView Delegate
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
+ ANDebug(@"isReady: %@", NSStringFromSelector(_cmd));
+ self.isReady = YES;
+}
+
+@end
+
+@implementation RuleActionSetParam
+
+- (BOOL)takeAction {
+ // set param
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+ return YES;
+}
+
+@end
+
+@implementation RuleActionEndRule
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ ANInfo(@"Client verification end rule");
+
+ return NO;
+}
+
+@end
+
+@implementation RuleActionTriggerRule
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ if (self.message != nil) {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance] kickoffRuleWithName:self.message];
+ });
+ }
+
+ ANInfo(@"Client verification trigger another rule %@", self.message);
+
+ return YES;
+}
+
+@end
+
+@implementation RuleActionAssignGroup
+
+- (BOOL)takeAction {
+ ANDebug(@"%@: %@", self, NSStringFromSelector(_cmd));
+
+ ANInfo(@"Client verification assign group action");
+
+ return YES;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleActionInteractionHandler.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleActionInteractionHandler.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleActionInteractionHandler.h (working copy)
@@ -0,0 +1,17 @@
+//
+// RuleActionInteractionHandler.h
+// MobileNow
+//
+// Created by Bryan Yuan on 1/16/13.
+// Copyright (c) 2013 MobileNow. All rights reserved.
+//
+
+#import
+#import "RuleAction.h"
+
+@interface RuleActionInteractionHandler : NSObject
+
+- (void)pushRuleAction:(RuleAction *) ruleAction;
+- (void)takeAction;
+- (void)cleanContext;
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleActionInteractionHandler.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleActionInteractionHandler.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleActionInteractionHandler.m (working copy)
@@ -0,0 +1,101 @@
+//
+// RuleActionInteractionHandler.m
+// MobileNow
+//
+// Created by Bryan Yuan on 1/16/13.
+// Copyright (c) 2013 MobileNow. All rights reserved.
+//
+
+#import "RuleActionInteractionHandler.h"
+
+@interface RuleActionInteractionHandler ()
+
+@property (nonatomic, strong) NSMutableArray *rulesMutableArray;
+@property (nonatomic, assign) NSInteger currentRuleIndex;
+
+@end
+
+@implementation RuleActionInteractionHandler
+
+@synthesize rulesMutableArray = _rulesMutableArray;
+
+- (NSMutableArray *)rulesMutableArray {
+ @synchronized(self) {
+ if (_rulesMutableArray == nil) {
+ _rulesMutableArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _rulesMutableArray;
+ }
+}
+
+- (void)pushRuleAction:(RuleAction *) ruleAction {
+ [self.rulesMutableArray addObject:ruleAction];
+}
+
+- (void)takeAction {
+ if (self.currentRuleIndex >= self.rulesMutableArray.count) {
+ ANError(@"NULL UI ruleAction");
+ return;
+ }
+
+ RuleAction *ruleAction = (RuleAction *)[self.rulesMutableArray objectAtIndex:self.currentRuleIndex];
+ if (ruleAction == nil) {
+ ANError(@"no UI ruleAction");
+ return;
+ }
+
+ ANDebug(@"perform No.%zi ruleAction", self.currentRuleIndex);
+
+ [ruleAction addObserver:self forKeyPath:KEYPATH_RAUIP_IS_READY options:NSKeyValueObservingOptionNew context:NULL];
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ if ([ruleAction respondsToSelector:@selector(performAction)]) {
+ [ruleAction performSelector:@selector(performAction)];
+ }
+ });
+}
+
+- (void)cleanContext {
+ @synchronized(self) {
+ self.currentRuleIndex = 0;
+
+ int i = 0;
+ RuleAction *ruleAction;
+
+ @try {
+ for (i = 0; i<[self.rulesMutableArray count]; i++) {
+ ruleAction = [self.rulesMutableArray objectAtIndex:i];
+ [ruleAction removeObserver:self forKeyPath:KEYPATH_RAUIP_IS_READY];
+ ruleAction = nil;
+ }
+ }
+ @catch (NSException *exception) {
+
+ }
+ @finally {
+
+ }
+ [self.rulesMutableArray removeAllObjects];
+ }
+}
+
+#pragma mark - KVO Delegate
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+ if ([keyPath isEqualToString:KEYPATH_RAUIP_IS_READY]) {
+ self.currentRuleIndex++;
+ ANDebug(@"currentRuleIndex++: %zi", self.currentRuleIndex);
+ [self takeAction];
+ @try {
+ [object removeObserver:self forKeyPath:KEYPATH_RAUIP_IS_READY];
+ }
+ @catch (NSException *exception) {
+
+ }
+ @finally {
+
+ }
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleTrigger.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleTrigger.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleTrigger.h (working copy)
@@ -0,0 +1,27 @@
+//
+// RuleTrigger.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/22/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+
+@interface RuleTrigger : NSObject
+
+@end
+
+@interface RuleTriggerPreLogin : RuleTrigger
+@end
+
+@interface RuleTriggerPostLogin : RuleTrigger
+@end
+
+@interface RuleTriggerTimer : RuleTrigger
+
+-(id)initWithDict:(NSDictionary *)dict;
+-(NSInteger) startTime;
+-(NSInteger) timeInterval;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleTrigger.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleTrigger.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RuleTrigger.m (working copy)
@@ -0,0 +1,61 @@
+//
+// RuleTrigger.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/22/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "RuleTrigger.h"
+
+@implementation RuleTrigger
+
+@end
+
+@implementation RuleTriggerPreLogin
+@end
+
+@implementation RuleTriggerPostLogin
+@end
+
+@interface RuleTriggerTimer ()
+
+#define RULE_TRIGGER_TIMER_ATTR_STARTTIME @"Starttime"
+#define RULE_TRIGGER_TIMER_ATTR_INTERVAL @"Interval"
+
+@property (nonatomic, copy) NSDictionary *attrDict;
+
+@end
+
+@implementation RuleTriggerTimer
+
+- (id)initWithDict:(NSDictionary *)dict {
+ self = [super init];
+ if (self) {
+ self.attrDict = dict;
+ }
+
+ return self;
+}
+
+- (NSInteger)startTime {
+ NSString *startTimeString = [self.attrDict objectForKey:RULE_TRIGGER_TIMER_ATTR_STARTTIME];
+ NSInteger startTimeInt = [startTimeString integerValue];
+ if (startTimeInt >= 0) {
+ return startTimeInt;
+ }
+
+ return NSIntegerMax;
+}
+
+- (NSInteger)timeInterval {
+ NSString *timeIntervalString = [self.attrDict objectForKey:RULE_TRIGGER_TIMER_ATTR_INTERVAL];
+ NSInteger timeIntervalInt = [timeIntervalString integerValue];
+ if (timeIntervalInt > 0) {
+ return timeIntervalInt;
+ }
+
+ return NSIntegerMax;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RulesManager.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RulesManager.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RulesManager.h (working copy)
@@ -0,0 +1,55 @@
+//
+// RulesManager.h
+// MobileNow
+//
+// Created by Bryan Yuan on 12/10/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import
+#import "RuleAction.h"
+#import "RuleActionInteractionHandler.h"
+
+#define KEYPATH_RM_IS_PARSE_DONE @"isParseDone"
+
+typedef enum {
+ RULE_TYPE_UNKNOW,
+ RULE_TYPE_PRE,
+ RULE_TYPE_POST
+} RULE_TYPE;
+
+@protocol TimerRuleDelegate
+
+- (void)shouldSignOut;
+
+@end
+
+@interface RulesManager : NSObject
+
+@property (nonatomic, assign) RULE_TYPE currentRuleType;
+@property (nonatomic, assign) BOOL isParseDone;
+@property (nonatomic, assign) BOOL didEndSession;
+
+@property (nonatomic, retain) RuleActionInteractionHandler *interactionHandler;
+@property (nonatomic, retain) RuleActionInteractionHandler *timerInteractionHandler;
+
+@property (nonatomic, weak) id delegate;
+
++ (RulesManager *)sharedInstance;
+
+- (void)parsePreRulesXML:(NSString *)rulesXMLString;
+- (void)parsePostRulesXML:(NSString *)rulesXMLString;
+
+- (void)kickoffTimerRules;
+- (void)stopTimerRules;
+- (void)didTrigTimer;
+
+- (void)kickoffSpecificRule:(NSString *)ruleName;
+
+- (void)kickoffRuleWithName:(NSString *)ruleName;
+- (void)runIntoEndSessionRule:(BOOL)isTimerRule;
+- (void)addRuleActionIntoUserInteractionArray:(RuleAction *)ruleAction;
+- (void)cleanTimerRuleInteraction;
+- (void)stopAllRules;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RulesManager.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RulesManager.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ClientVerification/RulesManager.m (working copy)
@@ -0,0 +1,594 @@
+//
+// RulesManager.m
+// MobileNow
+//
+// Created by Bryan Yuan on 12/10/12.
+// Copyright (c) 2012 MobileNow. All rights reserved.
+//
+
+#import "Rule.h"
+#import "RuleAction.h"
+#import "RulesManager.h"
+#import "ConditionCase.h"
+#import "ConditionEval.h"
+
+#define RULES @"Rules"
+#define RULES_RULE @"Rule"
+#define RULE_ATTR_NAME @"Name"
+
+#define RULE_TRIGGERS @"Triggers"
+#define RULE_TRIGGER_PRELOGIN @"prelogin"
+#define RULE_TRIGGER_POSTLOGIN @"postlogin"
+#define RULE_TRIGGER_TIMER @"timer"
+
+#define RULE_BODY @"Body"
+
+#define RULE_CONDITION @"Condition"
+#define RULE_COND_EVAL @"Eval"
+#define RULE_COND_EVAL_OSTYPE @"ostype"
+#define RULE_COND_EVAL_OSVER @"osver"
+#define RULE_COND_EVAL_TIMEOFDAY @"timeofday"
+#define RULE_COND_EVAL_MEMBEROF @"memberof"
+#define RULE_COND_EVAL_NETWORKTYPE @"networktype"
+#define RULE_COND_EVAL_WIFISSID @"wifissid"
+#define RULE_COND_EVAL_PARAM @"param"
+#define RULE_COND_EVAL_DEVIDSTATE @"devidstate"
+#define RULE_COND_EVAL_PASSCODEON @"passcodeon"
+#define RULE_COND_EVAL_APPINSTALLED @"appinstalled"
+#define RULE_COND_EVAL_MANUFACTURER @"manufacturer"
+#define RULE_COND_EVAL_NONSIGNEDAPPS @"nonsignedapps"
+#define RULE_COND_EVAL_WINSC @"winsc"
+#define RULE_COND_EVAL_WINSERVICEPACK @"winservicepack"
+#define RULE_COND_EVAL_IOSTYPE @"iostype"
+#define RULE_COND_EVAL_JAILBROKEN @"jailbroken"
+
+#define RULE_COND_CASE @"Case"
+
+#define RULE_ACTION_LOG @"log"
+#define RULE_ACTION_TERMSESS @"termsess"
+#define RULE_ACTION_ALERTUSER @"alertuser"
+#define RULE_ACTION_PROMPTUSER @"promptuser"
+#define RULE_ACTION_USERINPUT @"userinput"
+#define RULE_ACTION_SETPARAM @"setparam"
+#define RULE_ACTION_ENDRULE @"endrule"
+#define RULE_ACTION_TRIGGERRULE @"triggerrule"
+#define RULE_ACTION_ASSIGNGROUP @"assigngroup"
+#define RULE_ACTION_WINSCLOG @"winsclog"
+
+@interface RulesManager ()
+
+@property (nonatomic, retain) NSMutableArray *rulesMutableArray;
+@property (nonatomic, retain) NSMutableArray *preRulesArray;
+@property (nonatomic, retain) NSMutableArray *postRulesArray;
+@property (nonatomic, retain) NSMutableArray *timerRulesArray;
+/* some rules might don't have a trigger, they go here */
+@property (nonatomic, retain) NSMutableArray *otherRulesArray;
+
+
+@property (nonatomic, retain) Rule *currentRule;
+
+@property (nonatomic, assign) BOOL isTimerRule;
+
+@property (nonatomic, assign) BOOL accumulatingParsedCharacterData;
+@property (nonatomic, retain) NSMutableString *currentParsedCharacterData;
+
+@end
+
+@implementation RulesManager
+
+@synthesize isParseDone = _isParseDone;
+
+@synthesize rulesMutableArray = _rulesMutableArray;
+@synthesize preRulesArray = _preRulesArray;
+@synthesize postRulesArray = _postRulesArray;
+@synthesize timerRulesArray = _timerRulesArray;
+@synthesize otherRulesArray = _otherRulesArray;
+@synthesize currentRule = _currentRule;
+
+@synthesize isTimerRule = _isTimerRule;
+
+@synthesize accumulatingParsedCharacterData = _accumulatingParsedCharacterData;
+@synthesize currentParsedCharacterData = _currentParsedCharacterData;
+
++ (RulesManager *)sharedInstance {
+ static RulesManager * instance;
+ @synchronized([RulesManager class]) {
+ if(instance == nil){
+ instance = [[RulesManager alloc] init];
+ }
+ }
+
+ return instance;
+}
+
+- (void)kickoffRuleWithName:(NSString *)ruleName {
+ [self kickoffSpecificRule:ruleName];
+}
+
+- (void)runIntoEndSessionRule:(BOOL)isTimerRule {
+ if (isTimerRule) {
+ [self runIntoEndSessionRuleInTimer];
+ } else {
+ self.didEndSession = YES;
+ }
+}
+
+- (void)runIntoEndSessionRuleInTimer {
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [weakSelf notifyTermsess];
+ });
+}
+
+- (void)cleanTimerRuleInteraction {
+ [self.timerInteractionHandler cleanContext];
+}
+
+- (void)stopAllRules {
+ [self.interactionHandler cleanContext];
+ [self.timerInteractionHandler cleanContext];
+ [self stopTimerRules];
+}
+
+- (void)addRuleActionIntoUserInteractionArray:(RuleAction *)ruleAction {
+ if (ruleAction.isTimerRuleAction) {
+ [self.timerInteractionHandler pushRuleAction:ruleAction];
+ } else {
+ [self.interactionHandler pushRuleAction:ruleAction];
+ }
+}
+
+- (void)didTrigTimer {
+ [self.timerInteractionHandler takeAction];
+}
+
+- (void)notifyTermsess {
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [weakSelf.delegate shouldSignOut];
+ });
+}
+
+- (void)setIsParseDone:(BOOL)isParseDone {
+ if (isParseDone && !_isParseDone) {
+ [self takeAction];
+ }
+
+ _isParseDone = isParseDone;
+}
+
+- (RuleActionInteractionHandler *)interactionHandler {
+ if (_interactionHandler == nil) {
+ _interactionHandler = [[RuleActionInteractionHandler alloc] init];
+ }
+
+ return _interactionHandler;
+}
+
+- (RuleActionInteractionHandler *)timerInteractionHandler {
+ if (_timerInteractionHandler == nil) {
+ _timerInteractionHandler = [[RuleActionInteractionHandler alloc] init];
+ }
+
+ return _timerInteractionHandler;
+}
+
+- (NSMutableString *) currentParsedCharacterData {
+ if (_currentParsedCharacterData == nil) {
+ _currentParsedCharacterData = [[NSMutableString alloc] initWithCapacity:0];
+ }
+
+ return _currentParsedCharacterData;
+}
+
+- (NSMutableArray *)rulesMutableArray {
+ if (_rulesMutableArray == nil) {
+ _rulesMutableArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _rulesMutableArray;
+}
+
+- (NSMutableArray *)timerRulesArray {
+ if (_timerRulesArray == nil) {
+ _timerRulesArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _timerRulesArray;
+}
+
+- (NSMutableArray *)preRulesArray {
+ if (_preRulesArray == nil) {
+ _preRulesArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _preRulesArray;
+}
+
+- (NSMutableArray *)postRulesArray {
+ if (_postRulesArray == nil) {
+ _postRulesArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _postRulesArray;
+}
+
+- (NSMutableArray *)otherRulesArray {
+ if (_otherRulesArray == nil) {
+ _otherRulesArray = [[NSMutableArray alloc] initWithCapacity:0];
+ }
+
+ return _otherRulesArray;
+}
+
+- (void)addRule:(Rule *)rule {
+ /* look for the duplicated rule */
+ for (Rule *r in self.rulesMutableArray) {
+ if ([r.name isEqualToString:rule.name]) {
+ return;
+ }
+ }
+
+ [self.rulesMutableArray addObject:self.currentRule];
+}
+
+- (void)classifyRulesArray:(NSArray *)rulesArray {
+ for (Rule *rule in rulesArray) {
+ if ([rule isTimerRule]) {
+ [self.timerRulesArray addObject:rule];
+ } else if ([rule isPreRule]) {
+ [self.preRulesArray addObject:rule];
+ } else if ([rule isPostRule]) {
+ [self.postRulesArray addObject:rule];
+ } else {
+ [self.otherRulesArray addObject:rule];
+ }
+ }
+}
+
+- (BOOL)takeAction {
+ void (^takeActionBlock)(Rule *obj, NSUInteger idx, BOOL *stop) = ^(Rule *obj, NSUInteger idx, BOOL *stop) {
+ *stop = ![obj takeAction];
+ };
+
+ [self classifyRulesArray:self.rulesMutableArray];
+
+ ANDebug(@"rulesMutableArray: %@", self.rulesMutableArray);
+
+ self.rulesMutableArray = nil;
+
+ if (self.currentRuleType == RULE_TYPE_PRE) {
+ [self.preRulesArray enumerateObjectsUsingBlock:takeActionBlock];
+ } else if (self.currentRuleType == RULE_TYPE_POST) {
+ [self.postRulesArray enumerateObjectsUsingBlock:takeActionBlock];
+ }
+
+ return YES;
+}
+
+- (void)kickoffTimerRules {
+ [self.timerRulesArray enumerateObjectsUsingBlock:^(Rule *obj, NSUInteger idx, BOOL *stop) {
+ *stop = ![obj takeAction];
+ }];
+}
+
+- (void)stopTimerRules {
+ [self.timerRulesArray enumerateObjectsUsingBlock:^(Rule *obj, NSUInteger idx, BOOL *stop) {
+ *stop = ![obj stopTimer];
+ }];
+}
+
+- (void)kickoffPreRules {
+ [self takeAction];
+}
+
+- (void)kickoffPostRules {
+ [self takeAction];
+}
+
+- (void)kickoffSpecificRule:(NSString *)ruleName {
+ void (^takeActionBlock)(Rule *obj, NSUInteger idx, BOOL *stop) = ^(Rule *obj, NSUInteger idx, BOOL *stop) {
+ if ([obj.name isEqualToString:ruleName]) {
+ [obj takeAction];
+ *stop = YES;
+ }
+ };
+
+ if (self.currentRuleType == RULE_TYPE_PRE) {
+ // execute rule with name
+ [self.preRulesArray enumerateObjectsUsingBlock:takeActionBlock];
+ } else if (self.currentRuleType == RULE_TYPE_POST) {
+ [self.postRulesArray enumerateObjectsUsingBlock:takeActionBlock];
+ }
+
+ [self.otherRulesArray enumerateObjectsUsingBlock:takeActionBlock];
+}
+
+- (void)cleanRules {
+ [self.rulesMutableArray removeAllObjects];
+ [self.preRulesArray removeAllObjects];
+ [self.postRulesArray removeAllObjects];
+ [self.otherRulesArray removeAllObjects];
+ [self.timerRulesArray removeAllObjects];
+}
+
+- (void)parseRulesXML:(NSString *)rulesXMLString {
+ self.isParseDone = NO;
+
+ NSXMLParser *parser = [[NSXMLParser alloc] initWithData:[rulesXMLString dataUsingEncoding:NSUTF8StringEncoding]];
+ [parser setDelegate:self];
+ [parser parse];
+}
+
+- (void)parsePreRulesXML:(NSString *)rulesXMLString {
+ [self.interactionHandler cleanContext];
+ [self cleanRules];
+
+ self.currentRuleType = RULE_TYPE_PRE;
+ [self parseRulesXML:rulesXMLString];
+}
+
+- (void)parsePostRulesXML:(NSString *)rulesXMLString {
+ [self.interactionHandler cleanContext];
+ [self.timerInteractionHandler cleanContext];
+ [self cleanRules];
+
+ self.currentRuleType = RULE_TYPE_POST;
+ [self parseRulesXML:rulesXMLString];
+}
+
+#pragma - ClientVerification Logic
+
+- (void)initialCurrentCondition:(Condition *)aCondition {
+ if (aCondition == nil) {
+ self.currentRule.currentObject = [[Condition alloc] init];
+ } else {
+ self.currentRule.currentObject = aCondition;
+ }
+}
+
+- (void)pushCurrentCondition {
+ [self.currentRule pushCurrentObject];
+ ANDebug(@"currentRule: %@ : %@", self.currentRule, self.currentRule.objectsMutableArray);
+}
+
+- (Condition *)currentCondition {
+ return (Condition *)self.currentRule.currentObject;
+}
+
+- (void)initialCurrentConditionCase:(ConditionCase *)conditionCase {
+ Condition *currentCondition = [self currentCondition];
+
+ if (conditionCase == nil) {
+ currentCondition.currentObject = [[ConditionCase alloc] init];
+ } else {
+ currentCondition.currentObject = conditionCase;
+ }
+}
+
+- (void)pushCurrentConditionCase {
+ Condition *currentCondition = [self currentCondition];
+ [currentCondition pushCurrentObject];
+}
+
+- (ConditionCase *)currentConditionCase {
+ return (ConditionCase *)[self currentCondition].currentObject;
+}
+
+- (void)initialCurrentRuleAction:(RuleAction *)ruleAction {
+ ConditionCase *currentConditionCase = [self currentConditionCase];
+
+ if (ruleAction == nil) {
+ currentConditionCase.currentObject = [[RuleAction alloc] init];
+ } else {
+ currentConditionCase.currentObject = ruleAction;
+ }
+}
+
+- (void)pushCurrentRuleAction {
+ ConditionCase *currentConditionCase = [self currentConditionCase];
+ [currentConditionCase pushCurrentObject];
+}
+
+- (RuleAction *)currentRuleAction {
+ return (RuleAction *)[self currentConditionCase].currentObject;
+}
+
+#pragma mark - XML handler logic
+- (void)enableCollectingXMLData {
+ self.accumulatingParsedCharacterData = YES;
+ self.currentParsedCharacterData = nil;
+}
+
+- (void)disableCollectingXMLData {
+ self.accumulatingParsedCharacterData = NO;
+}
+
+#pragma mark - NSXMLParser delegate methods
+
+- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
+ attributes:(NSDictionary *)attributeDict {
+ if ([elementName isEqualToString:RULES]) {
+ self.rulesMutableArray = nil;
+ } else if ([elementName isEqualToString:RULES_RULE]) {
+ // initial current rule, set it's name attribute
+ self.currentRule = [[Rule alloc] init];
+
+ self.currentRule.name = [attributeDict objectForKey:RULE_ATTR_NAME];
+ } else if ([elementName isEqualToString:RULE_TRIGGERS]) {
+ self.isTimerRule = NO;
+ } else if ([elementName isEqualToString:RULE_TRIGGER_PRELOGIN]) {
+ self.currentRule.trigger = [[RuleTriggerPreLogin alloc] init];
+ } else if ([elementName isEqualToString:RULE_TRIGGER_POSTLOGIN]) {
+ self.currentRule.trigger = [[RuleTriggerPostLogin alloc] init];
+ } else if ([elementName isEqualToString:RULE_TRIGGER_TIMER]) {
+ self.currentRule.trigger = [[RuleTriggerTimer alloc] initWithDict:attributeDict];
+ self.isTimerRule = YES;
+ } else if ([elementName isEqualToString:RULE_BODY]) {
+
+ } else if ([elementName isEqualToString:RULE_CONDITION]) {
+ // initial a condition
+ [self initialCurrentCondition:nil];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL]) {
+
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_OSTYPE]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalOSType alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_OSVER]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalOSVersion alloc] init];
+ ANInfo(@"iOSVersion: %@", [[UIDevice currentDevice] systemVersion]);
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_TIMEOFDAY]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalTimeOfDay alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_MEMBEROF]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalMemberOf alloc] init];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_NETWORKTYPE]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalNetworkType alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_WIFISSID]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalWifiSSID alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_PARAM]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalParam alloc] init];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_DEVIDSTATE]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalDeviceIDState alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_PASSCODEON]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalPasscodeOn alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_APPINSTALLED]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalAppInstalled alloc] init];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_MANUFACTURER]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalManufacturer alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_NONSIGNEDAPPS]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalNonSignedApps alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_IOSTYPE]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalIOSType alloc] init];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_JAILBROKEN]) {
+ // set condition type
+ [self currentCondition].eval = [[ConditionEvalJailbroken alloc] init];
+ }
+
+ else if ([elementName isEqualToString:RULE_COND_CASE]) {
+ // EVAL -- several CASEs, switch to particular CASE according to the Value Attr of Case
+ // initial a CASE
+ ConditionCase *conditionCase = [[ConditionCase alloc] initWithDict:attributeDict];
+
+ [self initialCurrentConditionCase:conditionCase];
+
+ } else if ([elementName isEqualToString:RULE_ACTION_LOG]) {
+ // initial current action
+ [self initialCurrentRuleAction:[[RuleActionLog alloc] initWithDict:attributeDict]];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_ACTION_TERMSESS]) {
+ [self initialCurrentRuleAction:[[RuleActionTermsess alloc] initWithTimerType:self.isTimerRule]];
+ } else if ([elementName isEqualToString:RULE_ACTION_ALERTUSER]) {
+ [self initialCurrentRuleAction:[[RuleActionAlertUser alloc] initWithTimerType:self.isTimerRule]];
+
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_ACTION_PROMPTUSER]) {
+ [self initialCurrentRuleAction:[[RuleActionPromptUser alloc] initWithDict:attributeDict isTimerType:self.isTimerRule]];
+
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_ACTION_USERINPUT]) {
+ [self initialCurrentRuleAction:[[RuleActionUserInput alloc] initWithDict:attributeDict isTimerType:self.isTimerRule]];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_ACTION_SETPARAM]) {
+ [self initialCurrentRuleAction:[[RuleActionSetParam alloc] initWithDict:attributeDict]];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_ACTION_ENDRULE]) {
+ [self initialCurrentRuleAction:[[RuleActionEndRule alloc] initWithTimerType:self.isTimerRule]];
+ } else if ([elementName isEqualToString:RULE_ACTION_TRIGGERRULE]) {
+ [self initialCurrentRuleAction:[[RuleActionTriggerRule alloc] init]];
+ [self enableCollectingXMLData];
+ } else if ([elementName isEqualToString:RULE_ACTION_ASSIGNGROUP]) {
+ [self initialCurrentRuleAction:[[RuleActionAssignGroup alloc] init]];
+ }
+
+}
+
+- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName {
+ if ([elementName isEqualToString:RULES]) {
+ ANInfo(@"rulesMutableArray: %@", self.rulesMutableArray);
+ } else if ([elementName isEqualToString:RULES_RULE]) {
+ // put current rule into Array
+ [self addRule:self.currentRule];
+ } else if ([elementName isEqualToString:RULE_TRIGGER_TIMER]) {
+
+ } else if ([elementName isEqualToString:RULE_CONDITION]) {
+ // push current condition
+ [self pushCurrentCondition];
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_MEMBEROF]) {
+ [self disableCollectingXMLData];
+ [self currentCondition].eval.paramContent = self.currentParsedCharacterData;
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_PARAM]) {
+ [self disableCollectingXMLData];
+ [self currentCondition].eval.paramContent = self.currentParsedCharacterData;
+ } else if ([elementName isEqualToString:RULE_COND_EVAL_APPINSTALLED]) {
+ [self disableCollectingXMLData];
+ [self currentCondition].eval.paramContent = self.currentParsedCharacterData;
+ } else if ([elementName isEqualToString:RULE_COND_CASE]) {
+ // push current CASE
+ [self pushCurrentConditionCase];
+ } else if ([elementName isEqualToString:RULE_ACTION_LOG]) {
+ [self disableCollectingXMLData];
+ [self currentRuleAction].message = self.currentParsedCharacterData;
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_TERMSESS]) {
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_ALERTUSER]) {
+ [self disableCollectingXMLData];
+ [self currentRuleAction].message = self.currentParsedCharacterData;
+ NSLog(@"Rule message: %@", [self currentRuleAction].message);
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_PROMPTUSER]) {
+ [self disableCollectingXMLData];
+ [self currentRuleAction].message = self.currentParsedCharacterData;
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_USERINPUT]) {
+ [self disableCollectingXMLData];
+ [self currentRuleAction].message = self.currentParsedCharacterData;
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_SETPARAM]) {
+ [self disableCollectingXMLData];
+ [self currentRuleAction].message = self.currentParsedCharacterData;
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_ENDRULE]) {
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_TRIGGERRULE]) {
+ [self disableCollectingXMLData];
+ [self currentRuleAction].message = self.currentParsedCharacterData;
+ [self pushCurrentRuleAction];
+ } else if ([elementName isEqualToString:RULE_ACTION_ASSIGNGROUP]) {
+ [self pushCurrentRuleAction];
+ }
+}
+
+- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string {
+ if (self.accumulatingParsedCharacterData) {
+ // If the current element is one whose content we care about, append 'string'
+ // to the property that holds the content of the current element.
+ if (string != nil) {
+ [self.currentParsedCharacterData appendString:string];
+ }
+ }
+}
+
+- (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError {
+}
+
+- (void)parserDidEndDocument:(NSXMLParser *)parser {
+ self.isParseDone = YES;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CustomDesktopViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CustomDesktopViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CustomDesktopViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// CustomDesktopViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/9.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface CustomDesktopViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CustomDesktopViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CustomDesktopViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/CustomDesktopViewController.m (working copy)
@@ -0,0 +1,293 @@
+//
+// CustomDesktopViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/9.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "ANPopupDialog.h"
+#import "FBKVOController.h"
+#import "UIViewController+HideKeyboard.h"
+#import "CustomDesktopViewController.h"
+
+#define TOTAL_SECTIONS 1
+#define TOTAL_ROWS 3
+
+typedef NS_ENUM(NSInteger, CustomDesktopCellIndex) {
+ kCustomDesktopCellHostname = 0,
+ kCustomDesktopCellUsername,
+ kCustomDesktopCellDomain,
+};
+
+static NSString * const kHostnameCellID = @"HostnameCellID";
+static NSString * const kUsernameCellID = @"UsernameCellID";
+static NSString * const kDomainCellID = @"DomainCellID";
+
+static NSInteger kTextFieldTag = 1;
+
+@interface CustomDesktopViewController ()
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *connectButton;
+
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic) BOOL silence;
+
+@property (nonatomic, strong) GCustomItem *item;
+@property (nonatomic) BOOL inProcessing;
+
+@end
+
+@implementation CustomDesktopViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self initAppearance];
+ [self enableHideKeyboard];
+
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+
+ self.silence = YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.silence = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)connectButtonClicked:(id)sender {
+ NSString *host = [self getHostnameTextField].text;
+ NSString *username = [self getUsernameTextField].text;
+ NSString *domain = [self getDomainTextField].text;
+
+ if (self.inProcessing) return;
+
+ if (!host || host.length == 0) {
+ [self showErrorMessage:NSLocalizedString(@"The Host/IP cannot be empty!", nil)];
+ return;
+ }
+
+ NSRange range = [host rangeOfString:@":"];
+
+ NSString *port = @"3389";
+ if (range.length > 0) {
+ NSString *hostWithOutPort = [host substringToIndex:range.location];
+ port = [host substringFromIndex:range.location+1];
+ host = hostWithOutPort;
+ }
+
+ [self connectToHost:host withUsername:username domain:domain port:port];
+}
+
+- (void)connectToHost:(NSString *)host withUsername:(NSString *)username domain:(NSString *)domain port:(NSString *)port {
+ self.inProcessing = YES;
+
+ self.item = [[GCustomItem alloc] init];
+ self.item.server = host;
+ self.item.ssoUsername = username;
+ self.item.domain = domain;
+ self.item.port = port;
+
+ [self.item completeInit];
+
+ [self showShadow:YES];
+
+ [self.kvoController observe:self.item keyPath:@"status" options:NSKeyValueObservingOptionNew block:^(CustomDesktopViewController *observer, GCustomItem *item, NSDictionary *change) {
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (observer.silence) {
+ return;
+ }
+
+ if (item.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:item];
+ } else {
+ [observer openRDClient:item];
+ }
+ } else if (item.status >= ResourceStatusFailed) {
+ [observer.kvoController unobserve:host];
+ [observer showErrorMessage:NSLocalizedString(@"Cannot connect to remote host", nil)];
+ }
+ });
+
+ }];
+
+ [self.item prepare];
+}
+
+- (void)openRDClient:(GCustomItem *)item
+{
+ NSURL *url = item.url;
+ if (!url) {
+ return;
+ }
+
+ [self done];
+
+ OpenURL(url);
+}
+
+- (void)openRDClientNEC:(GCustomItem *)item {
+ NSURL *url = item.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ [self done];
+
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)showErrorMessage:(NSString *)message {
+ [self done];
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)done {
+ self.inProcessing = NO;
+ [self showShadow:NO];
+}
+
+- (void)showShadow:(BOOL)aBool {
+ CGRect frame;
+
+ [self.view endEditing:YES];
+
+ if (!_darkView) {
+ frame = self.view.bounds;
+ _darkView = [[UIControl alloc] initWithFrame:frame];
+ _darkView.backgroundColor = UIColorFromRGBA(0, 0.7);
+
+ UIActivityIndicatorView *a = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+ a.center = _darkView.center;
+ [a startAnimating];
+ [_darkView addSubview:a];
+ }
+
+ if (aBool) {
+ [_darkView removeFromSuperview];
+ [self.view addSubview:_darkView];
+ } else {
+ [_darkView removeFromSuperview];
+ }
+}
+
+- (UITextField *)getHostnameTextField {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:kCustomDesktopCellHostname inSection:0];
+ return [[self.tableView cellForRowAtIndexPath:indexPath] viewWithTag:kTextFieldTag];
+}
+
+- (UITextField *)getUsernameTextField {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:kCustomDesktopCellUsername inSection:0];
+ return [[self.tableView cellForRowAtIndexPath:indexPath] viewWithTag:kTextFieldTag];
+}
+
+- (UITextField *)getDomainTextField {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:kCustomDesktopCellDomain inSection:0];
+ return [[self.tableView cellForRowAtIndexPath:indexPath] viewWithTag:kTextFieldTag];
+}
+
+- (UITextField *)getTextFieldWithCell:(UITableViewCell *)cell {
+ return [cell viewWithTag:kTextFieldTag];
+}
+
+- (void)initAppearance {
+ self.connectButton.layer.cornerRadius = 2.5;
+ self.connectButton.layer.shadowOpacity = 0.25;
+ self.connectButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.connectButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ NSString *cellID = nil;
+ NSInteger row = indexPath.row;
+
+ switch (row) {
+ case kCustomDesktopCellHostname:
+ cellID = kHostnameCellID;
+ break;
+ case kCustomDesktopCellUsername:
+ cellID = kUsernameCellID;
+ break;
+ case kCustomDesktopCellDomain:
+ cellID = kDomainCellID;
+ break;
+
+ default:
+ break;
+ }
+
+ if (cellID != nil) {
+ cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ UITextField *textField = [self getTextFieldWithCell:cell];
+ if (textField != nil) {
+ Ivar ivar = class_getInstanceVariable([UITextField class], "_placeholderLabel");
+ UILabel *placeholderLabel = object_getIvar(textField, ivar);
+ placeholderLabel.textColor = UIColorFromRGBA(0x999999, 1.0);
+ }
+ } else {
+ cell = [[UITableViewCell alloc] init]; // Prevent from crash.
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewaySettingsViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewaySettingsViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewaySettingsViewController.h (working copy)
@@ -0,0 +1,23 @@
+//
+// GatewaySettingsViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/14.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+#import "Global.h"
+
+@protocol GatewaySettingDelegate
+
+- (void)didFinishedEdit:(BOOL)isNew;
+
+@end
+
+@interface GatewaySettingsViewController : UITableViewController
+
+@property (strong, nonatomic) Gateway *gateway;
+@property (weak, nonatomic) id delegate;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewaySettingsViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewaySettingsViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewaySettingsViewController.m (working copy)
@@ -0,0 +1,344 @@
+//
+// GatewaySettingsViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/14.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "CertificateManager.h"
+#import "GatewayManager.h"
+#import "PasswordManager.h"
+#import "CertificatesViewController.h"
+#import "UIViewController+HideKeyboard.h"
+#import "GatewaySettingsViewController.h"
+
+typedef enum {
+ kSettingsSectionFirst = 0,
+ kSettingsSectionSecond,
+ kSettingsSectionTotal,
+} SettingsSectionIndex;
+
+static NSInteger rowsInFirstSection = 5;
+static NSInteger rowsInSecondSection = 5;
+
+static NSInteger rowCertificate = 4;
+
+static NSString * const kSegueToCertificates = @"GatewaySettingsToCertificates";
+static NSString * const kSegueToInstallCertificate = @"GatewaySettingsToInstallCertificate";
+static NSString * const kStoryboardCertificatesID = @"CertificateViewControllerID";
+
+@interface GatewaySettingsViewController ()
+
+@property (weak, nonatomic) IBOutlet UITextField *titleTextField;
+@property (weak, nonatomic) IBOutlet UITextField *gatewayTextField;
+@property (weak, nonatomic) IBOutlet UITextField *usernameTextField;
+@property (weak, nonatomic) IBOutlet UITextField *portTextField;
+@property (weak, nonatomic) IBOutlet UISwitch *enableSecureTunnelSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *savePasswordSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *showLoginDialogSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *enableWebSSOSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *enableWebAuthSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *syferlockAuthSwitch;
+@property (weak, nonatomic) IBOutlet UILabel *certNameLabel;
+
+@end
+
+@implementation GatewaySettingsViewController
+
+- (void)dealloc {
+ self.gateway = nil;
+ self.delegate = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self enableHideKeyboard];
+ [self configureFields];
+
+ [self setFirstResponderIfNeeded];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)cancelButtonClicked:(id)sender {
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)saveButtonClicked:(id)sender {
+ BOOL ret = [self saveGateway];
+ if (!ret) {
+ return;
+ }
+
+ BOOL isNewAdded = self.gateway == nil;
+ [self.delegate didFinishedEdit:isNewAdded];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)savePasswordSwitched:(id)sender {
+ self.showLoginDialogSwitch.enabled = self.savePasswordSwitch.on;
+}
+
+- (void)setFirstResponderIfNeeded {
+ if (self.titleTextField.text.length == 0) {
+ [self.titleTextField becomeFirstResponder];
+ }
+}
+
+- (void)configureFields {
+ if (!self.gateway) {
+ return;
+ }
+
+ self.titleTextField.text = self.gateway.title;
+ self.gatewayTextField.text = self.gateway.url;
+ self.usernameTextField.text = self.gateway.username;
+ self.portTextField.text = self.gateway.port;
+ self.enableWebSSOSwitch.on = self.gateway.isWebSSOEnabled;
+ self.syferlockAuthSwitch.on = self.gateway.isSyferLockEnabled;
+ self.savePasswordSwitch.on = self.gateway.isSavePasswordEnabled;
+ self.showLoginDialogSwitch.on = self.gateway.isShowLoginDialogEnabled;
+ self.enableSecureTunnelSwitch.on = self.gateway.isSecureTunnelEnabled;
+ self.enableWebAuthSwitch.on = self.gateway.isWebAuthEnabled;
+ self.certNameLabel.text = self.gateway.certname;
+
+ self.showLoginDialogSwitch.enabled = self.savePasswordSwitch.on;
+
+ if (self.titleTextField.text.length > 0){
+
+ self.titleTextField.userInteractionEnabled = NO;
+ self.titleTextField.alpha = 0.4;
+ }else{
+
+ self.titleTextField.userInteractionEnabled = YES;
+ self.titleTextField.alpha = 1;
+ }
+}
+
+typedef enum {
+ CHECK_INPUT_OK,
+ CHECK_INPUT_ERROR_TITLE,
+ CHECK_INPUT_ERROR_URL,
+ CHECK_INPUT_ERROR_USERNAME,
+ CHECK_INPUT_ERROR_PORT,
+} CHECK_INPUT_RESULT;
+
+- (CHECK_INPUT_RESULT)checkInput {
+ CHECK_INPUT_RESULT ret = CHECK_INPUT_OK;
+
+ NSString *title, *message, *ok;
+
+ title = NSLocalizedString(@"Error", nil);
+ ok = NSLocalizedString(@"OK", nil);
+
+ NSNumberFormatter *f = [[NSNumberFormatter alloc] init];
+ [f setNumberStyle:NSNumberFormatterDecimalStyle];
+ NSNumber *port = [f numberFromString:self.portTextField.text];
+
+ if([self.titleTextField.text isEqual:@""]) {
+ message = NSLocalizedString(@"Display name is required", nil);
+ ret = CHECK_INPUT_ERROR_TITLE;
+ [self.titleTextField becomeFirstResponder];
+ } else if([self.gatewayTextField.text isEqual:@""]) {
+ message = NSLocalizedString(@"URL is required.",nil);
+ ret = CHECK_INPUT_ERROR_URL;
+ [self.gatewayTextField becomeFirstResponder];
+ } else if([self.portTextField.text isEqual:@""]) {
+ message = NSLocalizedString(@"Port is required.",nil);
+ ret = CHECK_INPUT_ERROR_PORT;
+ [self.portTextField becomeFirstResponder];
+ } else if(port == nil || [port integerValue] <= 0 || [port integerValue] > 65535) {
+ message = NSLocalizedString(@"Port is invalid.",nil);
+ ret = CHECK_INPUT_ERROR_PORT;
+ } else {
+ BOOL result = ([[GatewayManager sharedInstance] indexOfUrl:self.gatewayTextField.text andport:self.portTextField.text] != NSNotFound);//
+ if (result &&
+ (![self.gatewayTextField.text isEqualToString:self.gateway.url] ||
+ ![self.portTextField.text isEqualToString:self.gateway.port])) { // self.gateway only exists on gateway editing.
+ message = NSLocalizedString(@"The host already exists", nil);
+ ret = CHECK_INPUT_ERROR_URL;
+ } else {
+ return CHECK_INPUT_OK;
+ }
+ }
+
+ PopupDialog *popup = [ANPopupDialog singleButtonPopupDialogWithTitle:title message:message];
+ [self presentViewController:popup animated:YES completion:nil];
+
+ return ret;
+}
+
+- (BOOL)saveGateway {
+ [self.view endEditing:YES]; // Dismiss keyboard.
+
+ CHECK_INPUT_RESULT result = [self checkInput];
+ if (result != CHECK_INPUT_OK) {
+ return NO;
+ }
+
+ NSString *username = [self.usernameTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ Gateway *newGateway = self.gateway != nil ? self.gateway : [[Gateway alloc] init];
+ newGateway.title = self.titleTextField.text;
+ NSString *trimmedUrl = [self.gatewayTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ newGateway.url = trimmedUrl;
+ newGateway.host = [trimmedUrl rangeOfString:@"/"].location == NSNotFound ? trimmedUrl : [[trimmedUrl componentsSeparatedByString:@"/"] firstObject];
+ newGateway.alias = [trimmedUrl rangeOfString:@"/"].location == NSNotFound ? @"" : [[trimmedUrl componentsSeparatedByString:@"/"] lastObject];
+ newGateway.port = [self.portTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ if ([self isOldUsernameChanged:newGateway.username newUsername:username] &&
+ !newGateway.isFaceOrTouchIDEnabled &&
+ !newGateway.isGestureEnabled) { // If configured username changed, remove the saved password.
+ [self removePasswordWithHost:newGateway.host username:newGateway.username port:newGateway.port];
+ [self removePasswordWithHost:newGateway.host username:username port:newGateway.port]; // Clear both the old & the new accounts' passwords.
+ }
+ newGateway.username = username;
+ newGateway.isWebSSOEnabled = self.enableWebSSOSwitch.on;
+ newGateway.isSyferLockEnabled = self.syferlockAuthSwitch.on;
+ newGateway.isSavePasswordEnabled = self.savePasswordSwitch.on;
+ newGateway.isShowLoginDialogEnabled = self.showLoginDialogSwitch.on;
+ newGateway.isSecureTunnelEnabled = self.enableSecureTunnelSwitch.on;
+ newGateway.isWebAuthEnabled = self.enableWebAuthSwitch.on;
+ newGateway.certname = self.certNameLabel.text;
+
+ [self addOrUpdateGateway:newGateway];
+
+ return YES;
+}
+
+- (BOOL)isOldUsernameChanged:(NSString *)oldUsername newUsername:(NSString *)newUsername {
+ if (!oldUsername || [oldUsername isEqualToString:@""]) {
+ return NO;
+ }
+
+ return ![oldUsername isEqualToString:newUsername];
+}
+
+- (void)removePasswordWithHost:(NSString *)host username:(NSString *)username port:(NSString *)port {
+ [PasswordManager removePasswordsOfHost:host username:username port:port];
+}
+
+- (void)addOrUpdateGateway:(Gateway *)gateway {
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ if (_gateway) {
+ NSInteger index = [gatewayManager indexOfUrl:_gateway.url andport:_gateway.port];
+ [gatewayManager updateGateway:gateway atIndex:index];
+ } else {
+ [gatewayManager addGateway:gateway];
+ }
+}
+
+- (void)jumpToCertificate {
+ if ([CertificateManager sharedInstance].certificates.count == 0) {
+ ANDebug(@"No certificate has been found, try to install.");
+
+ [self certificateDidSelectedWithName:@""]; // Clear cert name if no cert exists.
+
+ // Push the CertificatesViewController into stack quietly.
+ UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
+ CertificatesViewController *controller = [mainStoryboard instantiateViewControllerWithIdentifier:kStoryboardCertificatesID];
+ [self.navigationController pushViewController:controller animated:NO];
+ controller.delegate = self;
+
+ [self performSegueWithIdentifier:kSegueToInstallCertificate sender:nil];
+ } else {
+ NSString *param = nil;
+ NSString *certName = self.certNameLabel.text;
+
+ if (certName && certName.length > 0) {
+ param = certName;
+ }
+ [self performSegueWithIdentifier:kSegueToCertificates sender:param];
+ }
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToCertificates]) {
+ CertificatesViewController *controller = segue.destinationViewController;
+ controller.selectedCertName = self.certNameLabel.text;
+ controller.delegate = self;
+ }
+}
+
+#pragma mark - CertificateChangeDelegate
+- (void)certificateDidSelectedWithName:(NSString *)name {
+ self.certNameLabel.text = name;
+}
+
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return kSettingsSectionTotal;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ NSInteger rows = 0;
+
+ switch (section) {
+ case kSettingsSectionFirst:
+ rows = rowsInFirstSection;
+ break;
+ case kSettingsSectionSecond:
+ rows = rowsInSecondSection;
+ break;
+
+ default:
+ break;
+ }
+
+ return rows;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ if (section == kSettingsSectionFirst) { // The first section doesn't have contain footerview.
+ return 15;
+ } else {
+ return 14;
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger section = indexPath.section;
+ NSInteger row = indexPath.row;
+
+ if (section == kSettingsSectionFirst && row == rowCertificate) {
+ [self jumpToCertificate];
+ }
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.titleTextField) {
+ [self.gatewayTextField becomeFirstResponder];
+ } else if(textField == self.gatewayTextField) {
+ [self.usernameTextField becomeFirstResponder];
+ } else if(textField == self.usernameTextField) {
+ [self.portTextField becomeFirstResponder];
+ } else if(textField == self.portTextField) {
+ [self.portTextField resignFirstResponder];
+ }
+
+ return YES;
+}
+
+#pragma mark - ANViewControllerSwitchProtocol
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option {
+ if (sender) {
+ self.delegate = sender;
+ if (option) {
+ self.gateway = [option valueForKey:@"gateway"];
+ }
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// GatewayViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/10.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface GatewayViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m (working copy)
@@ -0,0 +1,1172 @@
+//
+// GatewayViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/10.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "YCXMenu.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "AutoLoginHandler.h"
+#import "ArrayVPNWrapper.h"
+#import "GatewayModel.h"
+#import "GatewayCell.h"
+#import "UIView+Loading.h"
+#import "LoginViewController.h"
+#import "ResourcesViewController.h"
+#import "RulesManager.h"
+#import "EmptyGatewayCell.h"
+#import "GatewayViewLayout.h"
+#import "GatewayViewController.h"
+#import "GatewaySettingsViewController.h"
+#import "LocalAuthUtil.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "UIDevice+Hardware.h"
+#import "Singleton.h"
+#import "UIViewController+Activity.h"
+#import "SMSViewController.h"
+#import "ZTWebAuthViewController.h"
+
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+
+typedef NS_ENUM(NSInteger, MenuIndex) {
+ kMenuIndexLog = 0,
+ kMenuIndexAbout
+};
+
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define CancelConnection @"CancelConnection"
+#define JumpToLoginIn @"jumpToLoginIn"
+
+NSString * const kAppGroupNameGateway = @"group.net.arraynetworks.MotionProPlus";
+NSString * const kArrayVPNTunelErrorMsgGateway = @"net.arraynetworks.sslvpn.errormsg";
+NSString * const koAuthSetCodeGateway = @"net.arraynetworks.oauthsetcode";
+
+static NSString * const kSegueToSettings = @"GatewayToSettings";
+static NSString * const kSegueToLogin = @"GatewayToLogin";
+static NSString * const kSegueToResource = @"GatewayToResource";
+static NSString * const kSegueToAbout = @"GatewayToAbout";
+static NSString * const kSegueToLogSettings = @"GatewayToLogSettings";
+static NSString * const kSegueToWebAuth = @"GatewayToWebAuth";
+
+@interface GatewayViewController () {
+ VPNAccount *_loginAccount;
+ GatewayCell *_loginCell;
+ AutoLoginHandler *_autoLoginHandler;
+}
+
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UIPageControl *pageControl;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *addGatewayButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *moreButton;
+
+@property (strong, nonatomic) GatewayModel *model;
+@property (nonatomic, strong) NSString *webAuthUrl;
+@property (nonatomic, strong) NSString *callbackUrl;
+@property (nonatomic, strong) NSArray *realPasswords;
+@property (nonatomic, assign) BOOL isAutoLogin;
+@property (nonatomic, assign) BOOL isLocalDB; //Only the biometric authentication screen is displayed
+
+@end
+
+@implementation GatewayViewController
+
+- (void)dealloc {
+ self.model = nil;
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kVPNMessageNotification object:nil];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [[GatewayModel alloc] init];
+ self.model.delegate = self;
+
+ [self initNavigationBarAppearance];
+ [self initCollectionView];
+ [self initPageControl];
+ [self initButtonItems];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(autoConnectWithOauthCode:) name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelConnection) name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpToLoginIn) name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ static dispatch_once_t onceToken;
+
+ if (!_autoLoginHandler) {
+ _autoLoginHandler = [[AutoLoginHandler alloc] initWithDelegate:self];
+ }
+
+ if (_autoLoginHandler.url) {
+ // If autolaunch, do not show add gateway view.
+ dispatch_once(&onceToken, ^{
+ [_autoLoginHandler readyToAutoLogin];
+ });
+ return;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToAbout] || [segue.identifier isEqualToString:kSegueToLogSettings] || [segue.identifier isEqualToString:kSegueToChallenge] || [segue.identifier isEqualToString:kSegueToChangePassword] ||
+ [segue.identifier isEqualToString:kSegueToSMS]) {
+ return; // These destinations doesn't need more setting.
+ }
+
+ id p = nil;
+ NSDictionary *option = nil;
+
+ UINavigationController *destNavivation = (UINavigationController *)segue.destinationViewController;
+ if (destNavivation.viewControllers.count > 0) {
+ p = [destNavivation.viewControllers firstObject];
+ } else {
+ ANError(@"Can't find destination view controller.");
+ return;
+ }
+
+ if ([segue.identifier isEqualToString:kSegueToSettings]) {
+ if ([sender isKindOfClass:[Gateway class]]) {
+ option = @{@"gateway": sender};
+ }
+ [p switchFromSender:self withOption:option];
+ } else if ([segue.identifier isEqualToString:kSegueToLogin]) {
+ [p switchFromSender:self withOption:nil];
+ }
+}
+
+-(NSDictionary *) webAuthConfig
+{
+ NSDictionary *option = nil;
+ Gateway *gateway = [self.model currentGateway];
+ __weak typeof(self) weakSelf = self;
+ void (^competion)(NSError *error, NSString *session, NSString *username, NSString *acsInfo) = ^(NSError *error, NSString *session, NSString *username, NSString *acsInfo) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+
+ ANInfo(@"Error: %@, Session:%@, username:%@, oauth acsInfo:%@", error, session, username, acsInfo);
+
+ if (session && session.length > 0) {
+ if (acsInfo && acsInfo.length > 0) {
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager setOAuthAcsInfo:acsInfo];
+ }
+ if (self.webAuthUrl && [self.webAuthUrl length] > 0) {
+ [strongSelf.model loginWithSession:session andUsername:username andoAuthURL:self.webAuthUrl andcallbackURL:self.callbackUrl];
+ } else {
+ [strongSelf.model loginWithSession:session andUsername:username];
+ }
+ } else {
+ [strongSelf didFinishLogin:NO];
+ };
+
+ if (error) {
+ NSString *message = NSLocalizedString(@"Connection to server failed", nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [strongSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ };
+
+ option = @{@"host": gateway.host,
+ @"port": gateway.port,
+ @"alias": gateway.alias,
+ @"url": self.webAuthUrl,
+ @"completion": competion
+ };
+
+ return option;
+}
+
+- (void)addButtonClicked:(id)sender {
+ [self performSegueWithIdentifier:kSegueToSettings sender:self];
+}
+
+- (void)moreButtonClicked:(id)sender {
+ YCXMenuItem *logItem = [YCXMenuItem menuItem:NSLocalizedString(@"Log", nil)
+ image:[UIImage imageNamed:@"GatewayLog"]
+ tag:kMenuIndexLog
+ userInfo:nil];
+ [logItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+
+ YCXMenuItem *aboutItem = [YCXMenuItem menuItem:NSLocalizedString(@"About", nil)
+ image:[UIImage imageNamed:@"GatewayAbout"]
+ tag:kMenuIndexAbout
+ userInfo:nil];
+ [aboutItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+ NSArray *items = @[logItem, aboutItem];
+
+ [YCXMenu setTintColor:[UIColor whiteColor]];
+ [YCXMenu setSeparatorColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setSelectedColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setCornerRadius:CGFLOAT_MIN];
+ if ([YCXMenu isShow]){
+ [YCXMenu dismissMenu];
+ } else {
+ [YCXMenu showMenuInView:self.view fromRect:CGRectMake(self.view.frame.size.width - 60, 0, 60, 0) menuItems:items selected:^(NSInteger index, YCXMenuItem *item) {
+ if (index == kMenuIndexLog) {
+ [self performSegueWithIdentifier:kSegueToLogSettings sender:nil];
+ } else if (index == kMenuIndexAbout) {
+ [self performSegueWithIdentifier:kSegueToAbout sender:nil];
+ }
+ }];
+ }
+}
+
+- (void)initNavigationBarAppearance {
+ // To make the black line under navigation bar disappear (for iOS11).
+ [[UINavigationBar appearance] setBackgroundImage:[[UIImage alloc] init] forBarMetrics:UIBarMetricsDefault];
+ [[UINavigationBar appearance] setShadowImage:[[UIImage alloc] init]];
+}
+
+- (void)initCollectionView {
+ // Register cells.
+ [self.collectionView registerNib:[UINib nibWithNibName:@"EmptyGatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kEmptyGatewayCellID];
+ [self.collectionView registerNib:[UINib nibWithNibName:@"GatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kGatewayCellID];
+ // Setup layout class.
+ [self.collectionView setCollectionViewLayout:[[GatewayViewLayout alloc] init]];
+
+ self.collectionView.allowsSelection = YES;
+ self.collectionView.decelerationRate = 0.994; // Between UIScrollViewDecelerationRateNormal and UIScrollViewDecelerationRateFast
+}
+
+- (void)initPageControl {
+ [self setPageControlAppearance];
+ self.pageControl.userInteractionEnabled = NO;
+
+ NSInteger totalGateways = [self.model numberOfGateways];
+ if (totalGateways <= 0) {
+ self.pageControl.hidden = YES;
+ } else {
+ self.pageControl.hidden = NO;
+ self.pageControl.numberOfPages = totalGateways;
+ self.pageControl.currentPage = 0;
+ }
+}
+
+- (void)updatePageControlNumbers:(NSInteger)totalPages {
+ self.pageControl.hidden = totalPages > 0 ? NO : YES;
+ self.pageControl.numberOfPages = totalPages;
+}
+
+- (void)updatePageControlCurrentPage:(NSInteger)index {
+ NSInteger total = self.pageControl.numberOfPages;
+ if (index >= total || index < 0) {
+ ANDebug(@"Index \(%zi) of page control is out of page numbers \(%zi)", index, total);
+ return;
+ } else {
+ self.pageControl.currentPage = index;
+ }
+}
+
+- (void)updateCurrentGatewayIndex:(NSInteger)index {
+ [self.model selectGatewayAtIndex:index];
+ [Singleton sharedSingleton].currentPageNumber = index;
+}
+
+- (void)setGatewayCellAsSelectedWithIndex:(NSInteger)index {
+ [self clearGatewayCellsShadow];
+
+ [self setCurrentCellShadowWithIndex:index];
+}
+
+- (void)clearGatewayCellsShadow {
+ for (UICollectionViewCell *cell in self.collectionView.visibleCells) {
+ if (cell) {
+ if ([cell respondsToSelector:@selector(clearShadow)]) {
+ [cell performSelector:@selector(clearShadow)];
+ }
+ }
+ }
+}
+
+- (void)setCurrentCellShadowWithIndex:(NSInteger)index {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+ GatewayCell *currentCell = (GatewayCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+ if (currentCell) {
+ if ([currentCell respondsToSelector:@selector(addShadow)]) {
+ [currentCell performSelector:@selector(addShadow)];
+ }
+ }
+}
+
+- (void)initButtonItems {
+ [self.addGatewayButton setTarget:self];
+ [self.addGatewayButton setAction:@selector(addButtonClicked:)];
+
+ [self.moreButton setTarget:self];
+ [self.moreButton setAction:@selector(moreButtonClicked:)];
+}
+
+- (void)setPageControlAppearance {
+ self.pageControl.pageIndicatorTintColor = UIColorFromRGBA(0x999999, 1.0);
+ self.pageControl.currentPageIndicatorTintColor = MAIN_COLOR;
+}
+
+- (void)reloadWithAnimation {
+ [UIView transitionWithView:self.collectionView
+ duration:0.3
+ options:UIViewAnimationOptionTransitionCrossDissolve
+ animations:^{
+ [self.collectionView reloadData];
+ }
+ completion:nil];
+}
+
+- (void)deleteGateway {
+ [self.model deleteCurrentGateway];
+
+ NSInteger total = [self.model numberOfGateways];
+ if (total == 0) {
+ [self updateCurrentGatewayIndex:0];
+ [self reloadWithAnimation];
+ } else{
+
+ NSInteger integer = 0;
+ if (self.pageControl.currentPage == total){
+
+ integer = self.pageControl.currentPage - 1;
+ }else{
+
+ integer = self.pageControl.currentPage;
+ }
+
+ [self updateCurrentGatewayIndex:integer];
+ NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.pageControl.currentPage inSection:0];
+ [self.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [SecuritySetting clearGesture];
+ [self updatePageControlNumbers:[self.model numberOfGateways]];
+}
+
+#pragma mark - UICollectionViewDataSource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ return totalGateways > 0 ? totalGateways : 1;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+ UICollectionViewCell *cell = nil;
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ if (totalGateways > 0) {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kGatewayCellID forIndexPath:indexPath];
+ Gateway *gateway = [self.model gatewayAtIndex:indexPath.row];
+ if (gateway) {
+ [(GatewayCell *)cell configureWithGateway:gateway delegate:self];
+ }
+ } else {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kEmptyGatewayCellID forIndexPath:indexPath];
+ EmptyGatewayCell *emptyCell = (EmptyGatewayCell *)cell;
+ [emptyCell.addGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ [emptyCell.emptyGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+
+ if ([cell respondsToSelector:@selector(changeLayoutForIphone5)]) {
+ [cell performSelector:@selector(changeLayoutForIphone5)];
+ }
+
+ return cell;
+}
+
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+ [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+
+ [self setGatewayCellAsSelectedWithIndex:indexPath.item];
+}
+
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+ int page = (int)(scrollView.contentOffset.x / kCellWidth);
+ if (page != self.pageControl.currentPage) {
+ [self updatePageControlCurrentPage:page];
+ [self updateCurrentGatewayIndex:page];
+ [self setGatewayCellAsSelectedWithIndex:page];
+ }
+}
+
+#pragma mark - GatewaySettingDelegate
+- (void)didFinishedEdit:(BOOL)isNew {
+ NSInteger totalPages = [self.model numberOfGateways];
+ NSInteger currentPage = 0;
+ if (isNew) {
+ currentPage = totalPages-1;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ if (totalPages == 1) {
+ [self reloadWithAnimation];
+ } else {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView insertItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self updatePageControlNumbers:totalPages];
+ } else {
+ currentPage = self.pageControl.currentPage;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self setGatewayCellAsSelectedWithIndex:currentPage];
+
+ if (isNew) {
+
+ [self.collectionView setContentSize:CGSizeMake(currentPage * kScreenWidth, kScreenHeight)];
+ [self.collectionView setContentOffset:CGPointMake(currentPage * kScreenWidth, 0) animated:YES];
+ }
+}
+
+#pragma mark - GatewayCellDelegate
+- (void)didStartLogin:(NSString *)gatewayTitle cell:(UICollectionViewCell *)cell {
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:KEY_OAUTH_URL];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [AAAManager sharedInstance].resources = @"";
+
+ self.webAuthUrl = @"";
+ self.isAutoLogin = NO;
+ self.isLocalDB = YES;
+ [Singleton sharedSingleton].isAuthentication = NO;
+
+ if ([cell respondsToSelector:@selector(addShadow)]) {
+ [cell performSelector:@selector(addShadow)];
+ }
+
+ _loginCell = (GatewayCell *)cell;
+ [self.collectionView setScrollEnabled:NO];
+
+ Gateway *currentGateway = [self.model currentGateway];
+ if (!currentGateway.isWebAuthEnabled) {
+ [self.model login];
+ } else {
+ self.webAuthUrl = @"";
+ [self startWebAuth];
+ }
+}
+
+- (void)didCancelLogin:(NSString *)gatewayTitle {
+ _loginCell = nil;
+ [self.collectionView setScrollEnabled:YES];
+ [self.model cancelLogin];
+}
+
+- (void)willDeleteGateway:(NSString *)gatewayUrl {
+ if (!gatewayUrl) {
+ ANError(@"Gateway URL is nil, can't be deleted.");
+ return;
+ }
+ if (![gatewayUrl isEqualToString:[self.model currentGateway].url]) {
+ ANInfo(@"Gateway \"%@\" is not current gateway, don't delete.", gatewayUrl);
+ return;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Delete", nil)
+ message:NSLocalizedString(@"Are you sure to delete this site?", nil)
+ confirmAction:^{
+ Gateway *gateway = [weakSelf.model currentGateway];
+ if (!gateway) {
+ ANError(@"Can't find gateway named \"%@\".", gatewayUrl);
+ return;
+ } else {
+ [weakSelf deleteGateway];
+ }
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+}
+
+- (void)willEditGateway:(NSString *)gatewayUrl andPort:(NSString *)gatewayPort {
+ Gateway *gateway = [self.model gatewayOfUrl:gatewayUrl andPort:gatewayPort];
+ [self performSegueWithIdentifier:kSegueToSettings sender:gateway];
+}
+
+#pragma mark - WebAuth
+- (void)startWebAuth {
+ [self webAuthConfig];
+ ZTWebAuthViewController *control = [[ZTWebAuthViewController alloc] init];
+ control.infoDic = [self webAuthConfig];
+ [self.navigationController pushViewController:control animated:YES];
+}
+
+#pragma mark - Login Handler
+- (void)didFinishLogin:(BOOL)success {
+ [_loginCell setAsNormal];
+
+ [self.collectionView setScrollEnabled:YES];
+
+ if (success) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]]; // Update gateway cell after login.
+
+ [self performSegueWithIdentifier:kSegueToResource sender:self];
+ }
+}
+
+- (void)continueLoginWithUrl:(NSString *)url callback:(NSString *)callback {
+ self.webAuthUrl = url;
+ self.callbackUrl = callback;
+ [_loginCell setAsLoggingIn];
+
+ if (url) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]];
+ [self startWebAuth];
+ }
+}
+
+#pragma mark - Auto Login Handler
+- (void)perpareForAutoLogin:(void (^)(void))completion {
+ completion();
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account {
+ if (!account) {
+ return;
+ }
+
+ _loginAccount = account;
+
+ __weak __typeof(self) weakSelf = self;
+ [self perpareForAutoLogin:^{
+ [weakSelf sendAutoLogoutNotification];
+ [weakSelf doRealAutoLogin];
+ }];
+
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account oauthreq:(NSString *)request oauthcode:(NSString *)code {
+ NSString *urlString = nil;
+ if ([account.vsPort isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@?code=%@", account.vsHost, OAUTH_SESSION_URL, request, code];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@?code=%@", account.vsHost, account.vsPort, OAUTH_SESSION_URL, request, code];
+ }
+ ANInfo(@"didReceiveLoginRequest:continue login url=%@", urlString);
+ [self continueLoginWithUrl:urlString callback:account.autoLoginCallback];
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account session:(NSString *)sess {
+ if (!sess || sess.length <= 0) {
+ ANWarn(@"Can't create secure tunnel with empty session.");
+ return;
+ }
+
+ [self triggerNetworkFlowWithHost:account.vsHost andPort:account.vsPort];
+
+ ANDebug(@"Secure tunnel will be created with session.");
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.account = account;
+ [manager setSessionID:sess];
+
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [[ArrayVPNWrapper sharedInstance] startSSLVPN];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgGateway object:nil];
+}
+
+- (void)doRealAutoLogin {
+ if (!_loginAccount) return;
+
+ __weak __typeof(self) weakSelf = self;
+ [self.navigationController.view startLoadingWithMessage:@"Connecting..."
+ buttonTitle:NSLocalizedString(@"Cancel", nil)
+ cancelAction:^{
+ [weakSelf.model cancelLogin];
+ }];
+
+ [self.model autoLoginwithAccount:_loginAccount];
+}
+
+- (void)logoutThenLogin {
+ __weak __typeof(self) weakSelf = self;
+
+ [self.model logoutCurrentSession:^{
+ ANDebug(@"Logout successfully, do login");
+
+ [self sendAutoLogoutNotification];
+ // Wait 1 second for l3vpn thread to stop.
+ [weakSelf performSelector:@selector(doRealAutoLogin) withObject:nil afterDelay:1];
+ }];
+}
+
+- (void)autoLoginFailed:(NSString *)errorMessage {
+ if (!errorMessage) {
+ return;
+ }
+
+ ANInfo(@"Login failed: %@", errorMessage);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:errorMessage
+ confirmAction:nil
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)didReceiveDisconnectRequest:(VPNAccount *)account IsLogout:(BOOL)islogout {
+ ANInfo(@"Receive logout request");
+
+ [self sendAutoLogoutNotification];
+
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:account.vsURL andport:account.vsPort];
+ if (!gateway) { // MPP has been launched by URLScheme with session.
+ ANDebug(@"Secure tunnel will be destoryed with session.");
+
+ [[ArrayVPNWrapper sharedInstance] stopSSLVPN];
+ if (islogout) {
+ NSInteger ret = [[AAAManager sharedInstance] logoutL3VPNSession];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+ }
+ }
+}
+
+- (void)sendAutoLogoutNotification {
+ [[NSNotificationCenter defaultCenter] postNotificationName:kAutoLogoutNotification object:nil];
+}
+
+/**
+ * This method is meaningful only on first time launched by URLScheme with session after installed from AppStore.
+ * Cuz it needs the user to allow MPP app to use network privilege, it MUST have network flow. So, it make
+ * a simple "HEAD" http request here, and the result is not cared about.
+ */
+- (void)triggerNetworkFlowWithHost:(NSString *)host andPort:(NSString *)port {
+ NSString *realPort = @"443";
+
+ if (!host || host.length == 0) {
+ return;
+ }
+
+ if (port && port.length > 0) {
+ realPort = port;
+ }
+
+ NSString *urlString = [NSString stringWithFormat:@"https://%@:%@", host, realPort];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+ request.HTTPMethod = @"HEAD";
+ NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:nil];
+ [connection start];
+
+ ANDebug(@"A http request has been sent for auto-login. URL is: %@.", urlString);
+}
+
+- (void)autoConnectWithOauthCode:(NSNotification *)notification {
+ NSString *code =[notification.userInfo objectForKey:@"code"];
+
+ if (code.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get oAuth code failed.");
+
+ return;
+ }
+
+ ANInfo(@"autoConnectWithOauthCode: get oauth code successfully=%@", code);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get saved oauth url failed.");
+
+ return;
+ }
+ oauthUrl = [NSString stringWithFormat:@"%@%@", oauthUrl, code];
+ ANInfo(@"autoConnectWithOauthCode: connect with oauth url=%@", oauthUrl);
+ [self continueLoginWithUrl:oauthUrl callback:nil];
+}
+
+#pragma mark - GatewayModelDelegate
+- (void)needLoginInfo {
+
+ BOOL isAuth = [Singleton sharedSingleton].isAuthentication;
+ Gateway *gateway = [self.model currentGateway];
+
+ if (isAuth || gateway.isRadiusPWD){
+
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+ }else{
+
+ [self checkVerifyMothod];
+ }
+}
+
+- (void)needRegister {
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)needConfirm:(NSString *)message {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleActionSheet];
+ UIAlertAction *alertActionDestructive = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue, but never show me this again", nil)
+ style:UIAlertActionStyleDestructive
+ handler:^(UIAlertAction *action){
+ [weakSelf.model suppressCheckServerCertForCurrentGateway];
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionDefault = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction *action){
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionCancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction *action){
+ [weakSelf didFinishLogin:NO];
+ }];
+ [alertController addAction:alertActionDestructive];
+ [alertController addAction:alertActionDefault];
+ [alertController addAction:alertActionCancel];
+ UIPopoverPresentationController *popover = alertController.popoverPresentationController;
+ if (popover){
+ popover.sourceView = self.view;
+ popover.sourceRect = CGRectMake(self.view.bounds.size.width/2.0, self.view.bounds.size.height, 1.0, 1.0);
+ popover.permittedArrowDirections = UIPopoverArrowDirectionAny;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self presentViewController:alertController animated:YES completion:nil];
+ });
+}
+
+- (void)needLogout {
+ ANInfo(@"Need logout current session");
+
+ __weak typeof(self) weakSelf = self;
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"There is currently an active connection to %@, you can disconnect the current session,\
+ and start a new connection, or display the active connection.", nil),
+ [AAAManager sharedInstance].account.vsHost];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:message
+ confirmTitle:NSLocalizedString(@"Active Connection",nil)
+ cancelTitle:NSLocalizedString(@"New Connection", nil)
+ confirmAction:^{
+ [weakSelf logoutThenLogin];
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)needVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ [weakSelf.model loginWithVDIUsername:nil password:nil];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = alertController.textFields[0].text; // Username text field
+ NSString *password = alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+ [weakSelf.model loginWithVDIUsername:username password:password];
+ }];
+
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [alertController addAction:confirmAction];
+ [alertController addAction:cancelAction];
+
+ [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)needDoPreLoginCV {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)loginError:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginErrorOfTip:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Tips",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginFinished:(BOOL)success {
+ [self didFinishLogin:success];
+
+ [self.navigationController.view stopLoading];
+}
+
+- (void)checkVerifyMothod {
+ Gateway *gateway = [self.model currentGateway];
+ NSString *username = gateway.username;
+ NSString *port = gateway.port;
+
+ _realPasswords = @[@"", @"", @""];
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGateway]];
+ NSString *lastName = [methodDic objectForKey:@"userName"] ?: @"";
+ if ([username isEqualToString:@""]){
+
+ username = lastName;
+ }
+
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:port];
+ }
+ if ([username isEqualToString:lastName] && (gateway.isGestureEnabled || gateway.isFaceOrTouchIDEnabled)) {
+
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:port];
+ if (![_realPasswords isEqual:@[@"", @"", @""]]){
+
+ [self mutilVerifyMothod];
+ return;
+ }
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+ [Singleton setCurrentGatewayMethod:@{} andKey:gateway];
+ }
+ }
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+#pragma mark - 生物认证 手势认证
+-(void) mutilVerifyMothod
+{
+ Gateway *gw = [self.model currentGateway];
+ if (gw.isFaceOrTouchIDEnabled || gw.isGestureEnabled){
+
+ [Singleton sharedSingleton].isAuthentication = YES;
+ LocalAuthFinishBlockType completeBlock = ^(BOOL isAllow, SecuritySettingOption authType){
+
+ [Singleton sharedSingleton].isAuthentication = isAllow;
+ if (isAllow){
+
+ self.isAutoLogin = YES;
+ [self login];
+ }
+ };
+ UIViewController *control = [LocalAuthUtil getAuthVCWithCompletion:completeBlock];
+ control.modalPresentationStyle = UIModalPresentationFullScreen;
+ [self presentViewController:control animated:YES completion:nil];
+ }
+}
+
+- (void)login {
+
+ VPNAccount *account = [self inputResult];
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.errorCode = 0; // Success
+ [manager continueVPNThreadWithAccount:account];
+}
+
+- (VPNAccount *)inputResult {
+
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount * account = manager.account;
+
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGatewayUpInside]];
+
+ NSString *methodType = [methodDic objectForKey:@"methodType"];
+ if ([methodType isEqualToString:@"0"]){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ account.loginMethod = [methodDic objectForKey:@"methodName"] ?: @"";
+ account.userName = [methodDic objectForKey:@"userName"] ?: @"";
+
+ account.passWord = _realPasswords[0] ?: @"";
+ account.passWord2 = _realPasswords[1] ?: @"";
+ account.passWord3 = _realPasswords[2] ?: @"";
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+-(void) cancelConnection
+{
+ [self didFinishLogin:NO];
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+-(void) jumpToLoginIn
+{
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)handleVPNNotification:(NSNotification *)notification {
+ //only faceid/touchid/gestuer auth
+ if (!self.isAutoLogin){
+
+ return;
+ }
+
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ [self didFinishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ self.isAutoLogin = NO;
+ [self didFinishLogin:NO];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_WRONG_USER_PASS:
+ aMessage = manager.errorInformation;
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (!gw.isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:{
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ }
+ }
+ case VPN_CB_SMS: {
+ self.isLocalDB = NO;
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+- (void)pop {
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.InfosecEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.InfosecEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.InfosecEnterprise (working copy)
@@ -0,0 +1,1184 @@
+//
+// GatewayViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/10.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "YCXMenu.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "AutoLoginHandler.h"
+#import "ArrayVPNWrapper.h"
+#import "GatewayModel.h"
+#import "GatewayCell.h"
+#import "UIView+Loading.h"
+#import "LoginViewController.h"
+#import "ResourcesViewController.h"
+#import "RulesManager.h"
+#import "EmptyGatewayCell.h"
+#import "GatewayViewLayout.h"
+#import "GatewayViewController.h"
+#import "GatewaySettingsViewController.h"
+#import "LocalAuthUtil.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "UIDevice+Hardware.h"
+#import "Singleton.h"
+#import "UIViewController+Activity.h"
+#import "SMSViewController.h"
+#import "ZTWebAuthViewController.h"
+
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+
+typedef NS_ENUM(NSInteger, MenuIndex) {
+ kMenuIndexLog = 0,
+ kMenuIndexAbout
+};
+
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define CancelConnection @"CancelConnection"
+#define JumpToLoginIn @"jumpToLoginIn"
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameGateway = @"group.net.infosec.groupenterprise";
+NSString * const kArrayVPNTunelErrorMsgGateway = @"net.arraynetworks.sslvpn.errormsg";
+NSString * const koAuthSetCodeGateway = @"net.arraynetworks.oauthsetcode";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameGateway = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+static NSString * const kSegueToSettings = @"GatewayToSettings";
+static NSString * const kSegueToLogin = @"GatewayToLogin";
+static NSString * const kSegueToResource = @"GatewayToResource";
+static NSString * const kSegueToAbout = @"GatewayToAbout";
+static NSString * const kSegueToLogSettings = @"GatewayToLogSettings";
+static NSString * const kSegueToWebAuth = @"GatewayToWebAuth";
+
+@interface GatewayViewController () {
+ VPNAccount *_loginAccount;
+ GatewayCell *_loginCell;
+ AutoLoginHandler *_autoLoginHandler;
+}
+
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UIPageControl *pageControl;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *addGatewayButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *moreButton;
+
+@property (strong, nonatomic) GatewayModel *model;
+@property (nonatomic, strong) NSString *webAuthUrl;
+@property (nonatomic, strong) NSString *callbackUrl;
+@property (nonatomic, strong) NSArray *realPasswords;
+@property (nonatomic, assign) BOOL isAutoLogin;
+@property (nonatomic, assign) BOOL isLocalDB; //Only the biometric authentication screen is displayed
+
+@end
+
+@implementation GatewayViewController
+
+- (void)dealloc {
+ self.model = nil;
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [[GatewayModel alloc] init];
+ self.model.delegate = self;
+
+ [self initNavigationBarAppearance];
+ [self initCollectionView];
+ [self initPageControl];
+ [self initButtonItems];
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(autoConnectWithOauthCode:) name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelConnection) name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpToLoginIn) name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ static dispatch_once_t onceToken;
+
+ if (!_autoLoginHandler) {
+ _autoLoginHandler = [[AutoLoginHandler alloc] initWithDelegate:self];
+ }
+
+ if (_autoLoginHandler.url) {
+ // If autolaunch, do not show add gateway view.
+ dispatch_once(&onceToken, ^{
+ [_autoLoginHandler readyToAutoLogin];
+ });
+ return;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToAbout] || [segue.identifier isEqualToString:kSegueToLogSettings] || [segue.identifier isEqualToString:kSegueToChallenge] || [segue.identifier isEqualToString:kSegueToChangePassword] ||
+ [segue.identifier isEqualToString:kSegueToSMS]) {
+ return; // These destinations doesn't need more setting.
+ }
+
+ id p = nil;
+ NSDictionary *option = nil;
+
+ UINavigationController *destNavivation = (UINavigationController *)segue.destinationViewController;
+ if (destNavivation.viewControllers.count > 0) {
+ p = [destNavivation.viewControllers firstObject];
+ } else {
+ ANError(@"Can't find destination view controller.");
+ return;
+ }
+
+ if ([segue.identifier isEqualToString:kSegueToSettings]) {
+ if ([sender isKindOfClass:[Gateway class]]) {
+ option = @{@"gateway": sender};
+ }
+ [p switchFromSender:self withOption:option];
+ } else if ([segue.identifier isEqualToString:kSegueToLogin]) {
+ [p switchFromSender:self withOption:nil];
+ }
+}
+
+-(NSDictionary *) webAuthConfig
+{
+ NSDictionary *option = nil;
+ Gateway *gateway = [self.model currentGateway];
+ __weak typeof(self) weakSelf = self;
+ void (^competion)(NSError *error, NSString *session, NSString *username, NSString *acsInfo) = ^(NSError *error, NSString *session, NSString *username, NSString *acsInfo) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+
+ ANInfo(@"Error: %@, Session:%@, username:%@, oauth acsInfo:%@", error, session, username, acsInfo);
+
+ if (session && session.length > 0) {
+ if (acsInfo && acsInfo.length > 0) {
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager setOAuthAcsInfo:acsInfo];
+ }
+ if (self.webAuthUrl && [self.webAuthUrl length] > 0) {
+ [strongSelf.model loginWithSession:session andUsername:username andoAuthURL:self.webAuthUrl andcallbackURL:self.callbackUrl];
+ } else {
+ [strongSelf.model loginWithSession:session andUsername:username];
+ }
+ } else {
+ [strongSelf didFinishLogin:NO];
+ };
+
+ if (error) {
+ NSString *message = NSLocalizedString(@"Connection to server failed", nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [strongSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ };
+
+ option = @{@"host": gateway.host,
+ @"port": gateway.port,
+ @"alias": gateway.alias,
+ @"url": self.webAuthUrl,
+ @"completion": competion
+ };
+
+ return option;
+}
+
+- (void)addButtonClicked:(id)sender {
+ [self performSegueWithIdentifier:kSegueToSettings sender:self];
+}
+
+- (void)moreButtonClicked:(id)sender {
+ YCXMenuItem *logItem = [YCXMenuItem menuItem:NSLocalizedString(@"Log", nil)
+ image:[UIImage imageNamed:@"GatewayLog"]
+ tag:kMenuIndexLog
+ userInfo:nil];
+ [logItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+
+ YCXMenuItem *aboutItem = [YCXMenuItem menuItem:NSLocalizedString(@"About", nil)
+ image:[UIImage imageNamed:@"GatewayAbout"]
+ tag:kMenuIndexAbout
+ userInfo:nil];
+ [aboutItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+ NSArray *items = @[logItem, aboutItem];
+
+ [YCXMenu setTintColor:[UIColor whiteColor]];
+ [YCXMenu setSeparatorColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setSelectedColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setCornerRadius:CGFLOAT_MIN];
+ if ([YCXMenu isShow]){
+ [YCXMenu dismissMenu];
+ } else {
+ [YCXMenu showMenuInView:self.view fromRect:CGRectMake(self.view.frame.size.width - 60, 0, 60, 0) menuItems:items selected:^(NSInteger index, YCXMenuItem *item) {
+ if (index == kMenuIndexLog) {
+ [self performSegueWithIdentifier:kSegueToLogSettings sender:nil];
+ } else if (index == kMenuIndexAbout) {
+ [self performSegueWithIdentifier:kSegueToAbout sender:nil];
+ }
+ }];
+ }
+}
+
+- (void)initNavigationBarAppearance {
+ // To make the black line under navigation bar disappear (for iOS11).
+ [[UINavigationBar appearance] setBackgroundImage:[[UIImage alloc] init] forBarMetrics:UIBarMetricsDefault];
+ [[UINavigationBar appearance] setShadowImage:[[UIImage alloc] init]];
+}
+
+- (void)initCollectionView {
+ // Register cells.
+ [self.collectionView registerNib:[UINib nibWithNibName:@"EmptyGatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kEmptyGatewayCellID];
+ [self.collectionView registerNib:[UINib nibWithNibName:@"GatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kGatewayCellID];
+ // Setup layout class.
+ [self.collectionView setCollectionViewLayout:[[GatewayViewLayout alloc] init]];
+
+ self.collectionView.allowsSelection = YES;
+ self.collectionView.decelerationRate = 0.994; // Between UIScrollViewDecelerationRateNormal and UIScrollViewDecelerationRateFast
+}
+
+- (void)initPageControl {
+ [self setPageControlAppearance];
+ self.pageControl.userInteractionEnabled = NO;
+
+ NSInteger totalGateways = [self.model numberOfGateways];
+ if (totalGateways <= 0) {
+ self.pageControl.hidden = YES;
+ } else {
+ self.pageControl.hidden = NO;
+ self.pageControl.numberOfPages = totalGateways;
+ self.pageControl.currentPage = 0;
+ }
+}
+
+- (void)updatePageControlNumbers:(NSInteger)totalPages {
+ self.pageControl.hidden = totalPages > 0 ? NO : YES;
+ self.pageControl.numberOfPages = totalPages;
+}
+
+- (void)updatePageControlCurrentPage:(NSInteger)index {
+ NSInteger total = self.pageControl.numberOfPages;
+ if (index >= total || index < 0) {
+ ANDebug(@"Index \(%zi) of page control is out of page numbers \(%zi)", index, total);
+ return;
+ } else {
+ self.pageControl.currentPage = index;
+ }
+}
+
+- (void)updateCurrentGatewayIndex:(NSInteger)index {
+ [self.model selectGatewayAtIndex:index];
+ [Singleton sharedSingleton].currentPageNumber = index;
+}
+
+- (void)setGatewayCellAsSelectedWithIndex:(NSInteger)index {
+ [self clearGatewayCellsShadow];
+
+ [self setCurrentCellShadowWithIndex:index];
+}
+
+- (void)clearGatewayCellsShadow {
+ for (UICollectionViewCell *cell in self.collectionView.visibleCells) {
+ if (cell) {
+ if ([cell respondsToSelector:@selector(clearShadow)]) {
+ [cell performSelector:@selector(clearShadow)];
+ }
+ }
+ }
+}
+
+- (void)setCurrentCellShadowWithIndex:(NSInteger)index {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+ GatewayCell *currentCell = (GatewayCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+ if (currentCell) {
+ if ([currentCell respondsToSelector:@selector(addShadow)]) {
+ [currentCell performSelector:@selector(addShadow)];
+ }
+ }
+}
+
+- (void)initButtonItems {
+ [self.addGatewayButton setTarget:self];
+ [self.addGatewayButton setAction:@selector(addButtonClicked:)];
+
+ [self.moreButton setTarget:self];
+ [self.moreButton setAction:@selector(moreButtonClicked:)];
+}
+
+- (void)setPageControlAppearance {
+ self.pageControl.pageIndicatorTintColor = UIColorFromRGBA(0x999999, 1.0);
+ self.pageControl.currentPageIndicatorTintColor = MAIN_COLOR;
+}
+
+- (void)reloadWithAnimation {
+ [UIView transitionWithView:self.collectionView
+ duration:0.3
+ options:UIViewAnimationOptionTransitionCrossDissolve
+ animations:^{
+ [self.collectionView reloadData];
+ }
+ completion:nil];
+}
+
+- (void)deleteGateway {
+ [self.model deleteCurrentGateway];
+
+ NSInteger total = [self.model numberOfGateways];
+ if (total == 0) {
+ [self updateCurrentGatewayIndex:0];
+ [self reloadWithAnimation];
+ } else{
+
+ NSInteger integer = 0;
+ if (self.pageControl.currentPage == total){
+
+ integer = self.pageControl.currentPage - 1;
+ }else{
+
+ integer = self.pageControl.currentPage;
+ }
+
+ [self updateCurrentGatewayIndex:integer];
+ NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.pageControl.currentPage inSection:0];
+ [self.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [SecuritySetting clearGesture];
+ [self updatePageControlNumbers:[self.model numberOfGateways]];
+}
+
+#pragma mark - UICollectionViewDataSource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ return totalGateways > 0 ? totalGateways : 1;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+ UICollectionViewCell *cell = nil;
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ if (totalGateways > 0) {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kGatewayCellID forIndexPath:indexPath];
+ Gateway *gateway = [self.model gatewayAtIndex:indexPath.row];
+ if (gateway) {
+ [(GatewayCell *)cell configureWithGateway:gateway delegate:self];
+ }
+ } else {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kEmptyGatewayCellID forIndexPath:indexPath];
+ EmptyGatewayCell *emptyCell = (EmptyGatewayCell *)cell;
+ [emptyCell.addGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ [emptyCell.emptyGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+
+ if ([cell respondsToSelector:@selector(changeLayoutForIphone5)]) {
+ [cell performSelector:@selector(changeLayoutForIphone5)];
+ }
+
+ return cell;
+}
+
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+ [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+
+ [self setGatewayCellAsSelectedWithIndex:indexPath.item];
+}
+
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+ int page = (int)(scrollView.contentOffset.x / kCellWidth);
+ if (page != self.pageControl.currentPage) {
+ [self updatePageControlCurrentPage:page];
+ [self updateCurrentGatewayIndex:page];
+ [self setGatewayCellAsSelectedWithIndex:page];
+ }
+}
+
+#pragma mark - GatewaySettingDelegate
+- (void)didFinishedEdit:(BOOL)isNew {
+ NSInteger totalPages = [self.model numberOfGateways];
+ NSInteger currentPage = 0;
+ if (isNew) {
+ currentPage = totalPages-1;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ if (totalPages == 1) {
+ [self reloadWithAnimation];
+ } else {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView insertItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self updatePageControlNumbers:totalPages];
+ } else {
+ currentPage = self.pageControl.currentPage;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self setGatewayCellAsSelectedWithIndex:currentPage];
+
+ if (isNew) {
+
+ [self.collectionView setContentSize:CGSizeMake(currentPage * kScreenWidth, kScreenHeight)];
+ [self.collectionView setContentOffset:CGPointMake(currentPage * kScreenWidth, 0) animated:YES];
+ }
+}
+
+#pragma mark - GatewayCellDelegate
+- (void)didStartLogin:(NSString *)gatewayTitle cell:(UICollectionViewCell *)cell {
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:KEY_OAUTH_URL];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [AAAManager sharedInstance].resources = @"";
+
+ self.webAuthUrl = @"";
+ self.isAutoLogin = NO;
+ self.isLocalDB = YES;
+ [Singleton sharedSingleton].isAuthentication = NO;
+
+ if ([cell respondsToSelector:@selector(addShadow)]) {
+ [cell performSelector:@selector(addShadow)];
+ }
+
+ _loginCell = (GatewayCell *)cell;
+ [self.collectionView setScrollEnabled:NO];
+
+ Gateway *currentGateway = [self.model currentGateway];
+ if (!currentGateway.isWebAuthEnabled) {
+ [self.model login];
+ } else {
+ self.webAuthUrl = @"";
+ [self startWebAuth];
+ }
+}
+
+- (void)didCancelLogin:(NSString *)gatewayTitle {
+ _loginCell = nil;
+ [self.collectionView setScrollEnabled:YES];
+ [self.model cancelLogin];
+}
+
+- (void)willDeleteGateway:(NSString *)gatewayUrl {
+ if (!gatewayUrl) {
+ ANError(@"Gateway URL is nil, can't be deleted.");
+ return;
+ }
+ if (![gatewayUrl isEqualToString:[self.model currentGateway].url]) {
+ ANInfo(@"Gateway \"%@\" is not current gateway, don't delete.", gatewayUrl);
+ return;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Delete", nil)
+ message:NSLocalizedString(@"Are you sure to delete this site?", nil)
+ confirmAction:^{
+ Gateway *gateway = [weakSelf.model currentGateway];
+ if (!gateway) {
+ ANError(@"Can't find gateway named \"%@\".", gatewayUrl);
+ return;
+ } else {
+ [weakSelf deleteGateway];
+ }
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+}
+
+- (void)willEditGateway:(NSString *)gatewayUrl andPort:(NSString *)gatewayPort {
+ Gateway *gateway = [self.model gatewayOfUrl:gatewayUrl andPort:gatewayPort];
+ [self performSegueWithIdentifier:kSegueToSettings sender:gateway];
+}
+
+#pragma mark - WebAuth
+- (void)startWebAuth {
+ [self webAuthConfig];
+ ZTWebAuthViewController *control = [[ZTWebAuthViewController alloc] init];
+ control.infoDic = [self webAuthConfig];
+ [self.navigationController pushViewController:control animated:YES];
+}
+
+#pragma mark - Login Handler
+- (void)didFinishLogin:(BOOL)success {
+ [_loginCell setAsNormal];
+
+ [self.collectionView setScrollEnabled:YES];
+
+ if (success) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]]; // Update gateway cell after login.
+
+ [self performSegueWithIdentifier:kSegueToResource sender:self];
+ }
+}
+
+- (void)continueLoginWithUrl:(NSString *)url callback:(NSString *)callback {
+ self.webAuthUrl = url;
+ self.callbackUrl = callback;
+ [_loginCell setAsLoggingIn];
+
+ if (url) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]];
+ [self startWebAuth];
+ }
+}
+
+#pragma mark - Auto Login Handler
+- (void)perpareForAutoLogin:(void (^)(void))completion {
+ completion();
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account {
+ if (!account) {
+ return;
+ }
+
+ _loginAccount = account;
+
+ __weak __typeof(self) weakSelf = self;
+ [self perpareForAutoLogin:^{
+ [weakSelf sendAutoLogoutNotification];
+ [weakSelf doRealAutoLogin];
+ }];
+
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account oauthreq:(NSString *)request oauthcode:(NSString *)code {
+ NSString *urlString = nil;
+ if ([account.vsPort isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@?code=%@", account.vsHost, OAUTH_SESSION_URL, request, code];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@?code=%@", account.vsHost, account.vsPort, OAUTH_SESSION_URL, request, code];
+ }
+ ANInfo(@"didReceiveLoginRequest:continue login url=%@", urlString);
+ [self continueLoginWithUrl:urlString callback:account.autoLoginCallback];
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account session:(NSString *)sess {
+ if (!sess || sess.length <= 0) {
+ ANWarn(@"Can't create secure tunnel with empty session.");
+ return;
+ }
+
+ [self triggerNetworkFlowWithHost:account.vsHost andPort:account.vsPort];
+
+ ANDebug(@"Secure tunnel will be created with session.");
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.account = account;
+ [manager setSessionID:sess];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+#endif
+ [[ArrayVPNWrapper sharedInstance] startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgGateway object:nil];
+#endif
+}
+
+- (void)doRealAutoLogin {
+ if (!_loginAccount) return;
+
+ __weak __typeof(self) weakSelf = self;
+ [self.navigationController.view startLoadingWithMessage:@"Connecting..."
+ buttonTitle:NSLocalizedString(@"Cancel", nil)
+ cancelAction:^{
+ [weakSelf.model cancelLogin];
+ }];
+
+ [self.model autoLoginwithAccount:_loginAccount];
+}
+
+- (void)logoutThenLogin {
+ __weak __typeof(self) weakSelf = self;
+
+ [self.model logoutCurrentSession:^{
+ ANDebug(@"Logout successfully, do login");
+
+ [self sendAutoLogoutNotification];
+ // Wait 1 second for l3vpn thread to stop.
+ [weakSelf performSelector:@selector(doRealAutoLogin) withObject:nil afterDelay:1];
+ }];
+}
+
+- (void)autoLoginFailed:(NSString *)errorMessage {
+ if (!errorMessage) {
+ return;
+ }
+
+ ANInfo(@"Login failed: %@", errorMessage);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:errorMessage
+ confirmAction:nil
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)didReceiveDisconnectRequest:(VPNAccount *)account IsLogout:(BOOL)islogout {
+ ANInfo(@"Receive logout request");
+
+ [self sendAutoLogoutNotification];
+
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:account.vsURL andport:account.vsPort];
+ if (!gateway) { // MPP has been launched by URLScheme with session.
+ ANDebug(@"Secure tunnel will be destoryed with session.");
+
+ [[ArrayVPNWrapper sharedInstance] stopSSLVPN];
+ if (islogout) {
+ NSInteger ret = [[AAAManager sharedInstance] logoutL3VPNSession];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+ }
+ }
+}
+
+- (void)sendAutoLogoutNotification {
+ [[NSNotificationCenter defaultCenter] postNotificationName:kAutoLogoutNotification object:nil];
+}
+
+/**
+ * This method is meaningful only on first time launched by URLScheme with session after installed from AppStore.
+ * Cuz it needs the user to allow MPP app to use network privilege, it MUST have network flow. So, it make
+ * a simple "HEAD" http request here, and the result is not cared about.
+ */
+- (void)triggerNetworkFlowWithHost:(NSString *)host andPort:(NSString *)port {
+ NSString *realPort = @"443";
+
+ if (!host || host.length == 0) {
+ return;
+ }
+
+ if (port && port.length > 0) {
+ realPort = port;
+ }
+
+ NSString *urlString = [NSString stringWithFormat:@"https://%@:%@", host, realPort];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+ request.HTTPMethod = @"HEAD";
+ NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:nil];
+ [connection start];
+
+ ANDebug(@"A http request has been sent for auto-login. URL is: %@.", urlString);
+}
+
+- (void)autoConnectWithOauthCode:(NSNotification *)notification {
+ NSString *code =[notification.userInfo objectForKey:@"code"];
+
+ if (code.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get oAuth code failed.");
+
+ return;
+ }
+
+ ANInfo(@"autoConnectWithOauthCode: get oauth code successfully=%@", code);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get saved oauth url failed.");
+
+ return;
+ }
+ oauthUrl = [NSString stringWithFormat:@"%@%@", oauthUrl, code];
+ ANInfo(@"autoConnectWithOauthCode: connect with oauth url=%@", oauthUrl);
+ [self continueLoginWithUrl:oauthUrl callback:nil];
+}
+
+#pragma mark - GatewayModelDelegate
+- (void)needLoginInfo {
+
+ BOOL isAuth = [Singleton sharedSingleton].isAuthentication;
+ Gateway *gateway = [self.model currentGateway];
+
+ if (isAuth || gateway.isRadiusPWD){
+
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+ }else{
+
+ [self checkVerifyMothod];
+ }
+}
+
+- (void)needRegister {
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)needConfirm:(NSString *)message {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleActionSheet];
+ UIAlertAction *alertActionDestructive = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue, but never show me this again", nil)
+ style:UIAlertActionStyleDestructive
+ handler:^(UIAlertAction *action){
+ [weakSelf.model suppressCheckServerCertForCurrentGateway];
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionDefault = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction *action){
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionCancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction *action){
+ [weakSelf didFinishLogin:NO];
+ }];
+ [alertController addAction:alertActionDestructive];
+ [alertController addAction:alertActionDefault];
+ [alertController addAction:alertActionCancel];
+ UIPopoverPresentationController *popover = alertController.popoverPresentationController;
+ if (popover){
+ popover.sourceView = self.view;
+ popover.sourceRect = CGRectMake(self.view.bounds.size.width/2.0, self.view.bounds.size.height, 1.0, 1.0);
+ popover.permittedArrowDirections = UIPopoverArrowDirectionAny;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self presentViewController:alertController animated:YES completion:nil];
+ });
+}
+
+- (void)needLogout {
+ ANInfo(@"Need logout current session");
+
+ __weak typeof(self) weakSelf = self;
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"There is currently an active connection to %@, you can disconnect the current session,\
+ and start a new connection, or display the active connection.", nil),
+ [AAAManager sharedInstance].account.vsHost];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:message
+ confirmTitle:NSLocalizedString(@"Active Connection",nil)
+ cancelTitle:NSLocalizedString(@"New Connection", nil)
+ confirmAction:^{
+ [weakSelf logoutThenLogin];
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)needVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ [weakSelf.model loginWithVDIUsername:nil password:nil];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = alertController.textFields[0].text; // Username text field
+ NSString *password = alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+ [weakSelf.model loginWithVDIUsername:username password:password];
+ }];
+
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [alertController addAction:confirmAction];
+ [alertController addAction:cancelAction];
+
+ [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)needDoPreLoginCV {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)loginError:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginErrorOfTip:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Tips",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginFinished:(BOOL)success {
+ [self didFinishLogin:success];
+
+ [self.navigationController.view stopLoading];
+}
+
+- (void)checkVerifyMothod {
+ Gateway *gateway = [self.model currentGateway];
+ NSString *username = gateway.username;
+ NSString *port = gateway.port;
+
+ _realPasswords = @[@"", @"", @""];
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGateway]];
+ NSString *lastName = [methodDic objectForKey:@"userName"] ?: @"";
+ if ([username isEqualToString:@""]){
+
+ username = lastName;
+ }
+
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:port];
+ }
+ if ([username isEqualToString:lastName] && (gateway.isGestureEnabled || gateway.isFaceOrTouchIDEnabled)) {
+
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:port];
+ if (![_realPasswords isEqual:@[@"", @"", @""]]){
+
+ [self mutilVerifyMothod];
+ return;
+ }
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+ [Singleton setCurrentGatewayMethod:@{} andKey:gateway];
+ }
+ }
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+#pragma mark - 生物认证 手势认证
+-(void) mutilVerifyMothod
+{
+ Gateway *gw = [self.model currentGateway];
+ if (gw.isFaceOrTouchIDEnabled || gw.isGestureEnabled){
+
+ [Singleton sharedSingleton].isAuthentication = YES;
+ LocalAuthFinishBlockType completeBlock = ^(BOOL isAllow, SecuritySettingOption authType){
+
+ [Singleton sharedSingleton].isAuthentication = isAllow;
+ if (isAllow){
+
+ self.isAutoLogin = YES;
+ [self login];
+ }
+ };
+ UIViewController *control = [LocalAuthUtil getAuthVCWithCompletion:completeBlock];
+ control.modalPresentationStyle = UIModalPresentationFullScreen;
+ [self presentViewController:control animated:YES completion:nil];
+ }
+}
+
+- (void)login {
+
+ VPNAccount *account = [self inputResult];
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.errorCode = 0; // Success
+ [manager continueVPNThreadWithAccount:account];
+}
+
+- (VPNAccount *)inputResult {
+
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount * account = manager.account;
+
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGatewayUpInside]];
+
+ NSString *methodType = [methodDic objectForKey:@"methodType"];
+ if ([methodType isEqualToString:@"0"]){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ account.loginMethod = [methodDic objectForKey:@"methodName"] ?: @"";
+ account.userName = [methodDic objectForKey:@"userName"] ?: @"";
+
+ account.passWord = _realPasswords[0] ?: @"";
+ account.passWord2 = _realPasswords[1] ?: @"";
+ account.passWord3 = _realPasswords[2] ?: @"";
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+-(void) cancelConnection
+{
+ [self didFinishLogin:NO];
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+-(void) jumpToLoginIn
+{
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)handleVPNNotification:(NSNotification *)notification {
+ //only faceid/touchid/gestuer auth
+ if (!self.isAutoLogin){
+
+ return;
+ }
+
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ [self didFinishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ self.isAutoLogin = NO;
+ [self didFinishLogin:NO];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_WRONG_USER_PASS:
+ aMessage = manager.errorInformation;
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (!gw.isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:{
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ }
+ }
+ case VPN_CB_SMS: {
+ self.isLocalDB = NO;
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+- (void)pop {
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.InfosecStore
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.InfosecStore (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.InfosecStore (working copy)
@@ -0,0 +1,1184 @@
+//
+// GatewayViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/10.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "YCXMenu.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "AutoLoginHandler.h"
+#import "ArrayVPNWrapper.h"
+#import "GatewayModel.h"
+#import "GatewayCell.h"
+#import "UIView+Loading.h"
+#import "LoginViewController.h"
+#import "ResourcesViewController.h"
+#import "RulesManager.h"
+#import "EmptyGatewayCell.h"
+#import "GatewayViewLayout.h"
+#import "GatewayViewController.h"
+#import "GatewaySettingsViewController.h"
+#import "LocalAuthUtil.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "UIDevice+Hardware.h"
+#import "Singleton.h"
+#import "UIViewController+Activity.h"
+#import "SMSViewController.h"
+#import "ZTWebAuthViewController.h"
+
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+
+typedef NS_ENUM(NSInteger, MenuIndex) {
+ kMenuIndexLog = 0,
+ kMenuIndexAbout
+};
+
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define CancelConnection @"CancelConnection"
+#define JumpToLoginIn @"jumpToLoginIn"
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameGateway = @"group.net.infosec.MotionPro";
+NSString * const kArrayVPNTunelErrorMsgGateway = @"net.arraynetworks.sslvpn.errormsg";
+NSString * const koAuthSetCodeGateway = @"net.arraynetworks.oauthsetcode";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameGateway = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+static NSString * const kSegueToSettings = @"GatewayToSettings";
+static NSString * const kSegueToLogin = @"GatewayToLogin";
+static NSString * const kSegueToResource = @"GatewayToResource";
+static NSString * const kSegueToAbout = @"GatewayToAbout";
+static NSString * const kSegueToLogSettings = @"GatewayToLogSettings";
+static NSString * const kSegueToWebAuth = @"GatewayToWebAuth";
+
+@interface GatewayViewController () {
+ VPNAccount *_loginAccount;
+ GatewayCell *_loginCell;
+ AutoLoginHandler *_autoLoginHandler;
+}
+
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UIPageControl *pageControl;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *addGatewayButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *moreButton;
+
+@property (strong, nonatomic) GatewayModel *model;
+@property (nonatomic, strong) NSString *webAuthUrl;
+@property (nonatomic, strong) NSString *callbackUrl;
+@property (nonatomic, strong) NSArray *realPasswords;
+@property (nonatomic, assign) BOOL isAutoLogin;
+@property (nonatomic, assign) BOOL isLocalDB; //Only the biometric authentication screen is displayed
+
+@end
+
+@implementation GatewayViewController
+
+- (void)dealloc {
+ self.model = nil;
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [[GatewayModel alloc] init];
+ self.model.delegate = self;
+
+ [self initNavigationBarAppearance];
+ [self initCollectionView];
+ [self initPageControl];
+ [self initButtonItems];
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(autoConnectWithOauthCode:) name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelConnection) name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpToLoginIn) name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ static dispatch_once_t onceToken;
+
+ if (!_autoLoginHandler) {
+ _autoLoginHandler = [[AutoLoginHandler alloc] initWithDelegate:self];
+ }
+
+ if (_autoLoginHandler.url) {
+ // If autolaunch, do not show add gateway view.
+ dispatch_once(&onceToken, ^{
+ [_autoLoginHandler readyToAutoLogin];
+ });
+ return;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToAbout] || [segue.identifier isEqualToString:kSegueToLogSettings] || [segue.identifier isEqualToString:kSegueToChallenge] || [segue.identifier isEqualToString:kSegueToChangePassword] ||
+ [segue.identifier isEqualToString:kSegueToSMS]) {
+ return; // These destinations doesn't need more setting.
+ }
+
+ id p = nil;
+ NSDictionary *option = nil;
+
+ UINavigationController *destNavivation = (UINavigationController *)segue.destinationViewController;
+ if (destNavivation.viewControllers.count > 0) {
+ p = [destNavivation.viewControllers firstObject];
+ } else {
+ ANError(@"Can't find destination view controller.");
+ return;
+ }
+
+ if ([segue.identifier isEqualToString:kSegueToSettings]) {
+ if ([sender isKindOfClass:[Gateway class]]) {
+ option = @{@"gateway": sender};
+ }
+ [p switchFromSender:self withOption:option];
+ } else if ([segue.identifier isEqualToString:kSegueToLogin]) {
+ [p switchFromSender:self withOption:nil];
+ }
+}
+
+-(NSDictionary *) webAuthConfig
+{
+ NSDictionary *option = nil;
+ Gateway *gateway = [self.model currentGateway];
+ __weak typeof(self) weakSelf = self;
+ void (^competion)(NSError *error, NSString *session, NSString *username, NSString *acsInfo) = ^(NSError *error, NSString *session, NSString *username, NSString *acsInfo) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+
+ ANInfo(@"Error: %@, Session:%@, username:%@, oauth acsInfo:%@", error, session, username, acsInfo);
+
+ if (session && session.length > 0) {
+ if (acsInfo && acsInfo.length > 0) {
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager setOAuthAcsInfo:acsInfo];
+ }
+ if (self.webAuthUrl && [self.webAuthUrl length] > 0) {
+ [strongSelf.model loginWithSession:session andUsername:username andoAuthURL:self.webAuthUrl andcallbackURL:self.callbackUrl];
+ } else {
+ [strongSelf.model loginWithSession:session andUsername:username];
+ }
+ } else {
+ [strongSelf didFinishLogin:NO];
+ };
+
+ if (error) {
+ NSString *message = NSLocalizedString(@"Connection to server failed", nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [strongSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ };
+
+ option = @{@"host": gateway.host,
+ @"port": gateway.port,
+ @"alias": gateway.alias,
+ @"url": self.webAuthUrl,
+ @"completion": competion
+ };
+
+ return option;
+}
+
+- (void)addButtonClicked:(id)sender {
+ [self performSegueWithIdentifier:kSegueToSettings sender:self];
+}
+
+- (void)moreButtonClicked:(id)sender {
+ YCXMenuItem *logItem = [YCXMenuItem menuItem:NSLocalizedString(@"Log", nil)
+ image:[UIImage imageNamed:@"GatewayLog"]
+ tag:kMenuIndexLog
+ userInfo:nil];
+ [logItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+
+ YCXMenuItem *aboutItem = [YCXMenuItem menuItem:NSLocalizedString(@"About", nil)
+ image:[UIImage imageNamed:@"GatewayAbout"]
+ tag:kMenuIndexAbout
+ userInfo:nil];
+ [aboutItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+ NSArray *items = @[logItem, aboutItem];
+
+ [YCXMenu setTintColor:[UIColor whiteColor]];
+ [YCXMenu setSeparatorColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setSelectedColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setCornerRadius:CGFLOAT_MIN];
+ if ([YCXMenu isShow]){
+ [YCXMenu dismissMenu];
+ } else {
+ [YCXMenu showMenuInView:self.view fromRect:CGRectMake(self.view.frame.size.width - 60, 0, 60, 0) menuItems:items selected:^(NSInteger index, YCXMenuItem *item) {
+ if (index == kMenuIndexLog) {
+ [self performSegueWithIdentifier:kSegueToLogSettings sender:nil];
+ } else if (index == kMenuIndexAbout) {
+ [self performSegueWithIdentifier:kSegueToAbout sender:nil];
+ }
+ }];
+ }
+}
+
+- (void)initNavigationBarAppearance {
+ // To make the black line under navigation bar disappear (for iOS11).
+ [[UINavigationBar appearance] setBackgroundImage:[[UIImage alloc] init] forBarMetrics:UIBarMetricsDefault];
+ [[UINavigationBar appearance] setShadowImage:[[UIImage alloc] init]];
+}
+
+- (void)initCollectionView {
+ // Register cells.
+ [self.collectionView registerNib:[UINib nibWithNibName:@"EmptyGatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kEmptyGatewayCellID];
+ [self.collectionView registerNib:[UINib nibWithNibName:@"GatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kGatewayCellID];
+ // Setup layout class.
+ [self.collectionView setCollectionViewLayout:[[GatewayViewLayout alloc] init]];
+
+ self.collectionView.allowsSelection = YES;
+ self.collectionView.decelerationRate = 0.994; // Between UIScrollViewDecelerationRateNormal and UIScrollViewDecelerationRateFast
+}
+
+- (void)initPageControl {
+ [self setPageControlAppearance];
+ self.pageControl.userInteractionEnabled = NO;
+
+ NSInteger totalGateways = [self.model numberOfGateways];
+ if (totalGateways <= 0) {
+ self.pageControl.hidden = YES;
+ } else {
+ self.pageControl.hidden = NO;
+ self.pageControl.numberOfPages = totalGateways;
+ self.pageControl.currentPage = 0;
+ }
+}
+
+- (void)updatePageControlNumbers:(NSInteger)totalPages {
+ self.pageControl.hidden = totalPages > 0 ? NO : YES;
+ self.pageControl.numberOfPages = totalPages;
+}
+
+- (void)updatePageControlCurrentPage:(NSInteger)index {
+ NSInteger total = self.pageControl.numberOfPages;
+ if (index >= total || index < 0) {
+ ANDebug(@"Index \(%zi) of page control is out of page numbers \(%zi)", index, total);
+ return;
+ } else {
+ self.pageControl.currentPage = index;
+ }
+}
+
+- (void)updateCurrentGatewayIndex:(NSInteger)index {
+ [self.model selectGatewayAtIndex:index];
+ [Singleton sharedSingleton].currentPageNumber = index;
+}
+
+- (void)setGatewayCellAsSelectedWithIndex:(NSInteger)index {
+ [self clearGatewayCellsShadow];
+
+ [self setCurrentCellShadowWithIndex:index];
+}
+
+- (void)clearGatewayCellsShadow {
+ for (UICollectionViewCell *cell in self.collectionView.visibleCells) {
+ if (cell) {
+ if ([cell respondsToSelector:@selector(clearShadow)]) {
+ [cell performSelector:@selector(clearShadow)];
+ }
+ }
+ }
+}
+
+- (void)setCurrentCellShadowWithIndex:(NSInteger)index {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+ GatewayCell *currentCell = (GatewayCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+ if (currentCell) {
+ if ([currentCell respondsToSelector:@selector(addShadow)]) {
+ [currentCell performSelector:@selector(addShadow)];
+ }
+ }
+}
+
+- (void)initButtonItems {
+ [self.addGatewayButton setTarget:self];
+ [self.addGatewayButton setAction:@selector(addButtonClicked:)];
+
+ [self.moreButton setTarget:self];
+ [self.moreButton setAction:@selector(moreButtonClicked:)];
+}
+
+- (void)setPageControlAppearance {
+ self.pageControl.pageIndicatorTintColor = UIColorFromRGBA(0x999999, 1.0);
+ self.pageControl.currentPageIndicatorTintColor = MAIN_COLOR;
+}
+
+- (void)reloadWithAnimation {
+ [UIView transitionWithView:self.collectionView
+ duration:0.3
+ options:UIViewAnimationOptionTransitionCrossDissolve
+ animations:^{
+ [self.collectionView reloadData];
+ }
+ completion:nil];
+}
+
+- (void)deleteGateway {
+ [self.model deleteCurrentGateway];
+
+ NSInteger total = [self.model numberOfGateways];
+ if (total == 0) {
+ [self updateCurrentGatewayIndex:0];
+ [self reloadWithAnimation];
+ } else{
+
+ NSInteger integer = 0;
+ if (self.pageControl.currentPage == total){
+
+ integer = self.pageControl.currentPage - 1;
+ }else{
+
+ integer = self.pageControl.currentPage;
+ }
+
+ [self updateCurrentGatewayIndex:integer];
+ NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.pageControl.currentPage inSection:0];
+ [self.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [SecuritySetting clearGesture];
+ [self updatePageControlNumbers:[self.model numberOfGateways]];
+}
+
+#pragma mark - UICollectionViewDataSource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ return totalGateways > 0 ? totalGateways : 1;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+ UICollectionViewCell *cell = nil;
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ if (totalGateways > 0) {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kGatewayCellID forIndexPath:indexPath];
+ Gateway *gateway = [self.model gatewayAtIndex:indexPath.row];
+ if (gateway) {
+ [(GatewayCell *)cell configureWithGateway:gateway delegate:self];
+ }
+ } else {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kEmptyGatewayCellID forIndexPath:indexPath];
+ EmptyGatewayCell *emptyCell = (EmptyGatewayCell *)cell;
+ [emptyCell.addGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ [emptyCell.emptyGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+
+ if ([cell respondsToSelector:@selector(changeLayoutForIphone5)]) {
+ [cell performSelector:@selector(changeLayoutForIphone5)];
+ }
+
+ return cell;
+}
+
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+ [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+
+ [self setGatewayCellAsSelectedWithIndex:indexPath.item];
+}
+
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+ int page = (int)(scrollView.contentOffset.x / kCellWidth);
+ if (page != self.pageControl.currentPage) {
+ [self updatePageControlCurrentPage:page];
+ [self updateCurrentGatewayIndex:page];
+ [self setGatewayCellAsSelectedWithIndex:page];
+ }
+}
+
+#pragma mark - GatewaySettingDelegate
+- (void)didFinishedEdit:(BOOL)isNew {
+ NSInteger totalPages = [self.model numberOfGateways];
+ NSInteger currentPage = 0;
+ if (isNew) {
+ currentPage = totalPages-1;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ if (totalPages == 1) {
+ [self reloadWithAnimation];
+ } else {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView insertItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self updatePageControlNumbers:totalPages];
+ } else {
+ currentPage = self.pageControl.currentPage;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self setGatewayCellAsSelectedWithIndex:currentPage];
+
+ if (isNew) {
+
+ [self.collectionView setContentSize:CGSizeMake(currentPage * kScreenWidth, kScreenHeight)];
+ [self.collectionView setContentOffset:CGPointMake(currentPage * kScreenWidth, 0) animated:YES];
+ }
+}
+
+#pragma mark - GatewayCellDelegate
+- (void)didStartLogin:(NSString *)gatewayTitle cell:(UICollectionViewCell *)cell {
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:KEY_OAUTH_URL];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [AAAManager sharedInstance].resources = @"";
+
+ self.webAuthUrl = @"";
+ self.isAutoLogin = NO;
+ self.isLocalDB = YES;
+ [Singleton sharedSingleton].isAuthentication = NO;
+
+ if ([cell respondsToSelector:@selector(addShadow)]) {
+ [cell performSelector:@selector(addShadow)];
+ }
+
+ _loginCell = (GatewayCell *)cell;
+ [self.collectionView setScrollEnabled:NO];
+
+ Gateway *currentGateway = [self.model currentGateway];
+ if (!currentGateway.isWebAuthEnabled) {
+ [self.model login];
+ } else {
+ self.webAuthUrl = @"";
+ [self startWebAuth];
+ }
+}
+
+- (void)didCancelLogin:(NSString *)gatewayTitle {
+ _loginCell = nil;
+ [self.collectionView setScrollEnabled:YES];
+ [self.model cancelLogin];
+}
+
+- (void)willDeleteGateway:(NSString *)gatewayUrl {
+ if (!gatewayUrl) {
+ ANError(@"Gateway URL is nil, can't be deleted.");
+ return;
+ }
+ if (![gatewayUrl isEqualToString:[self.model currentGateway].url]) {
+ ANInfo(@"Gateway \"%@\" is not current gateway, don't delete.", gatewayUrl);
+ return;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Delete", nil)
+ message:NSLocalizedString(@"Are you sure to delete this site?", nil)
+ confirmAction:^{
+ Gateway *gateway = [weakSelf.model currentGateway];
+ if (!gateway) {
+ ANError(@"Can't find gateway named \"%@\".", gatewayUrl);
+ return;
+ } else {
+ [weakSelf deleteGateway];
+ }
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+}
+
+- (void)willEditGateway:(NSString *)gatewayUrl andPort:(NSString *)gatewayPort {
+ Gateway *gateway = [self.model gatewayOfUrl:gatewayUrl andPort:gatewayPort];
+ [self performSegueWithIdentifier:kSegueToSettings sender:gateway];
+}
+
+#pragma mark - WebAuth
+- (void)startWebAuth {
+ [self webAuthConfig];
+ ZTWebAuthViewController *control = [[ZTWebAuthViewController alloc] init];
+ control.infoDic = [self webAuthConfig];
+ [self.navigationController pushViewController:control animated:YES];
+}
+
+#pragma mark - Login Handler
+- (void)didFinishLogin:(BOOL)success {
+ [_loginCell setAsNormal];
+
+ [self.collectionView setScrollEnabled:YES];
+
+ if (success) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]]; // Update gateway cell after login.
+
+ [self performSegueWithIdentifier:kSegueToResource sender:self];
+ }
+}
+
+- (void)continueLoginWithUrl:(NSString *)url callback:(NSString *)callback {
+ self.webAuthUrl = url;
+ self.callbackUrl = callback;
+ [_loginCell setAsLoggingIn];
+
+ if (url) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]];
+ [self startWebAuth];
+ }
+}
+
+#pragma mark - Auto Login Handler
+- (void)perpareForAutoLogin:(void (^)(void))completion {
+ completion();
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account {
+ if (!account) {
+ return;
+ }
+
+ _loginAccount = account;
+
+ __weak __typeof(self) weakSelf = self;
+ [self perpareForAutoLogin:^{
+ [weakSelf sendAutoLogoutNotification];
+ [weakSelf doRealAutoLogin];
+ }];
+
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account oauthreq:(NSString *)request oauthcode:(NSString *)code {
+ NSString *urlString = nil;
+ if ([account.vsPort isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@?code=%@", account.vsHost, OAUTH_SESSION_URL, request, code];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@?code=%@", account.vsHost, account.vsPort, OAUTH_SESSION_URL, request, code];
+ }
+ ANInfo(@"didReceiveLoginRequest:continue login url=%@", urlString);
+ [self continueLoginWithUrl:urlString callback:account.autoLoginCallback];
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account session:(NSString *)sess {
+ if (!sess || sess.length <= 0) {
+ ANWarn(@"Can't create secure tunnel with empty session.");
+ return;
+ }
+
+ [self triggerNetworkFlowWithHost:account.vsHost andPort:account.vsPort];
+
+ ANDebug(@"Secure tunnel will be created with session.");
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.account = account;
+ [manager setSessionID:sess];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+#endif
+ [[ArrayVPNWrapper sharedInstance] startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgGateway object:nil];
+#endif
+}
+
+- (void)doRealAutoLogin {
+ if (!_loginAccount) return;
+
+ __weak __typeof(self) weakSelf = self;
+ [self.navigationController.view startLoadingWithMessage:@"Connecting..."
+ buttonTitle:NSLocalizedString(@"Cancel", nil)
+ cancelAction:^{
+ [weakSelf.model cancelLogin];
+ }];
+
+ [self.model autoLoginwithAccount:_loginAccount];
+}
+
+- (void)logoutThenLogin {
+ __weak __typeof(self) weakSelf = self;
+
+ [self.model logoutCurrentSession:^{
+ ANDebug(@"Logout successfully, do login");
+
+ [self sendAutoLogoutNotification];
+ // Wait 1 second for l3vpn thread to stop.
+ [weakSelf performSelector:@selector(doRealAutoLogin) withObject:nil afterDelay:1];
+ }];
+}
+
+- (void)autoLoginFailed:(NSString *)errorMessage {
+ if (!errorMessage) {
+ return;
+ }
+
+ ANInfo(@"Login failed: %@", errorMessage);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:errorMessage
+ confirmAction:nil
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)didReceiveDisconnectRequest:(VPNAccount *)account IsLogout:(BOOL)islogout {
+ ANInfo(@"Receive logout request");
+
+ [self sendAutoLogoutNotification];
+
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:account.vsURL andport:account.vsPort];
+ if (!gateway) { // MPP has been launched by URLScheme with session.
+ ANDebug(@"Secure tunnel will be destoryed with session.");
+
+ [[ArrayVPNWrapper sharedInstance] stopSSLVPN];
+ if (islogout) {
+ NSInteger ret = [[AAAManager sharedInstance] logoutL3VPNSession];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+ }
+ }
+}
+
+- (void)sendAutoLogoutNotification {
+ [[NSNotificationCenter defaultCenter] postNotificationName:kAutoLogoutNotification object:nil];
+}
+
+/**
+ * This method is meaningful only on first time launched by URLScheme with session after installed from AppStore.
+ * Cuz it needs the user to allow MPP app to use network privilege, it MUST have network flow. So, it make
+ * a simple "HEAD" http request here, and the result is not cared about.
+ */
+- (void)triggerNetworkFlowWithHost:(NSString *)host andPort:(NSString *)port {
+ NSString *realPort = @"443";
+
+ if (!host || host.length == 0) {
+ return;
+ }
+
+ if (port && port.length > 0) {
+ realPort = port;
+ }
+
+ NSString *urlString = [NSString stringWithFormat:@"https://%@:%@", host, realPort];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+ request.HTTPMethod = @"HEAD";
+ NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:nil];
+ [connection start];
+
+ ANDebug(@"A http request has been sent for auto-login. URL is: %@.", urlString);
+}
+
+- (void)autoConnectWithOauthCode:(NSNotification *)notification {
+ NSString *code =[notification.userInfo objectForKey:@"code"];
+
+ if (code.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get oAuth code failed.");
+
+ return;
+ }
+
+ ANInfo(@"autoConnectWithOauthCode: get oauth code successfully=%@", code);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get saved oauth url failed.");
+
+ return;
+ }
+ oauthUrl = [NSString stringWithFormat:@"%@%@", oauthUrl, code];
+ ANInfo(@"autoConnectWithOauthCode: connect with oauth url=%@", oauthUrl);
+ [self continueLoginWithUrl:oauthUrl callback:nil];
+}
+
+#pragma mark - GatewayModelDelegate
+- (void)needLoginInfo {
+
+ BOOL isAuth = [Singleton sharedSingleton].isAuthentication;
+ Gateway *gateway = [self.model currentGateway];
+
+ if (isAuth || gateway.isRadiusPWD){
+
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+ }else{
+
+ [self checkVerifyMothod];
+ }
+}
+
+- (void)needRegister {
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)needConfirm:(NSString *)message {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleActionSheet];
+ UIAlertAction *alertActionDestructive = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue, but never show me this again", nil)
+ style:UIAlertActionStyleDestructive
+ handler:^(UIAlertAction *action){
+ [weakSelf.model suppressCheckServerCertForCurrentGateway];
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionDefault = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction *action){
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionCancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction *action){
+ [weakSelf didFinishLogin:NO];
+ }];
+ [alertController addAction:alertActionDestructive];
+ [alertController addAction:alertActionDefault];
+ [alertController addAction:alertActionCancel];
+ UIPopoverPresentationController *popover = alertController.popoverPresentationController;
+ if (popover){
+ popover.sourceView = self.view;
+ popover.sourceRect = CGRectMake(self.view.bounds.size.width/2.0, self.view.bounds.size.height, 1.0, 1.0);
+ popover.permittedArrowDirections = UIPopoverArrowDirectionAny;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self presentViewController:alertController animated:YES completion:nil];
+ });
+}
+
+- (void)needLogout {
+ ANInfo(@"Need logout current session");
+
+ __weak typeof(self) weakSelf = self;
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"There is currently an active connection to %@, you can disconnect the current session,\
+ and start a new connection, or display the active connection.", nil),
+ [AAAManager sharedInstance].account.vsHost];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:message
+ confirmTitle:NSLocalizedString(@"Active Connection",nil)
+ cancelTitle:NSLocalizedString(@"New Connection", nil)
+ confirmAction:^{
+ [weakSelf logoutThenLogin];
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)needVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ [weakSelf.model loginWithVDIUsername:nil password:nil];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = alertController.textFields[0].text; // Username text field
+ NSString *password = alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+ [weakSelf.model loginWithVDIUsername:username password:password];
+ }];
+
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [alertController addAction:confirmAction];
+ [alertController addAction:cancelAction];
+
+ [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)needDoPreLoginCV {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)loginError:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginErrorOfTip:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Tips",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginFinished:(BOOL)success {
+ [self didFinishLogin:success];
+
+ [self.navigationController.view stopLoading];
+}
+
+- (void)checkVerifyMothod {
+ Gateway *gateway = [self.model currentGateway];
+ NSString *username = gateway.username;
+ NSString *port = gateway.port;
+
+ _realPasswords = @[@"", @"", @""];
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGateway]];
+ NSString *lastName = [methodDic objectForKey:@"userName"] ?: @"";
+ if ([username isEqualToString:@""]){
+
+ username = lastName;
+ }
+
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:port];
+ }
+ if ([username isEqualToString:lastName] && (gateway.isGestureEnabled || gateway.isFaceOrTouchIDEnabled)) {
+
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:port];
+ if (![_realPasswords isEqual:@[@"", @"", @""]]){
+
+ [self mutilVerifyMothod];
+ return;
+ }
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+ [Singleton setCurrentGatewayMethod:@{} andKey:gateway];
+ }
+ }
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+#pragma mark - 生物认证 手势认证
+-(void) mutilVerifyMothod
+{
+ Gateway *gw = [self.model currentGateway];
+ if (gw.isFaceOrTouchIDEnabled || gw.isGestureEnabled){
+
+ [Singleton sharedSingleton].isAuthentication = YES;
+ LocalAuthFinishBlockType completeBlock = ^(BOOL isAllow, SecuritySettingOption authType){
+
+ [Singleton sharedSingleton].isAuthentication = isAllow;
+ if (isAllow){
+
+ self.isAutoLogin = YES;
+ [self login];
+ }
+ };
+ UIViewController *control = [LocalAuthUtil getAuthVCWithCompletion:completeBlock];
+ control.modalPresentationStyle = UIModalPresentationFullScreen;
+ [self presentViewController:control animated:YES completion:nil];
+ }
+}
+
+- (void)login {
+
+ VPNAccount *account = [self inputResult];
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.errorCode = 0; // Success
+ [manager continueVPNThreadWithAccount:account];
+}
+
+- (VPNAccount *)inputResult {
+
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount * account = manager.account;
+
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGatewayUpInside]];
+
+ NSString *methodType = [methodDic objectForKey:@"methodType"];
+ if ([methodType isEqualToString:@"0"]){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ account.loginMethod = [methodDic objectForKey:@"methodName"] ?: @"";
+ account.userName = [methodDic objectForKey:@"userName"] ?: @"";
+
+ account.passWord = _realPasswords[0] ?: @"";
+ account.passWord2 = _realPasswords[1] ?: @"";
+ account.passWord3 = _realPasswords[2] ?: @"";
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+-(void) cancelConnection
+{
+ [self didFinishLogin:NO];
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+-(void) jumpToLoginIn
+{
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)handleVPNNotification:(NSNotification *)notification {
+ //only faceid/touchid/gestuer auth
+ if (!self.isAutoLogin){
+
+ return;
+ }
+
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ [self didFinishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ self.isAutoLogin = NO;
+ [self didFinishLogin:NO];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_WRONG_USER_PASS:
+ aMessage = manager.errorInformation;
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (!gw.isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:{
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ }
+ }
+ case VPN_CB_SMS: {
+ self.isLocalDB = NO;
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+- (void)pop {
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.MotionPro
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.MotionPro (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.MotionPro (working copy)
@@ -0,0 +1,1184 @@
+//
+// GatewayViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/10.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "YCXMenu.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "AutoLoginHandler.h"
+#import "ArrayVPNWrapper.h"
+#import "GatewayModel.h"
+#import "GatewayCell.h"
+#import "UIView+Loading.h"
+#import "LoginViewController.h"
+#import "ResourcesViewController.h"
+#import "RulesManager.h"
+#import "EmptyGatewayCell.h"
+#import "GatewayViewLayout.h"
+#import "GatewayViewController.h"
+#import "GatewaySettingsViewController.h"
+#import "LocalAuthUtil.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "UIDevice+Hardware.h"
+#import "Singleton.h"
+#import "UIViewController+Activity.h"
+#import "SMSViewController.h"
+#import "ZTWebAuthViewController.h"
+
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+
+typedef NS_ENUM(NSInteger, MenuIndex) {
+ kMenuIndexLog = 0,
+ kMenuIndexAbout
+};
+
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define CancelConnection @"CancelConnection"
+#define JumpToLoginIn @"jumpToLoginIn"
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameGateway = @"group.net.arraynetworks.MotionPro";
+NSString * const kArrayVPNTunelErrorMsgGateway = @"net.arraynetworks.sslvpn.errormsg";
+NSString * const koAuthSetCodeGateway = @"net.arraynetworks.oauthsetcode";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameGateway = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+static NSString * const kSegueToSettings = @"GatewayToSettings";
+static NSString * const kSegueToLogin = @"GatewayToLogin";
+static NSString * const kSegueToResource = @"GatewayToResource";
+static NSString * const kSegueToAbout = @"GatewayToAbout";
+static NSString * const kSegueToLogSettings = @"GatewayToLogSettings";
+static NSString * const kSegueToWebAuth = @"GatewayToWebAuth";
+
+@interface GatewayViewController () {
+ VPNAccount *_loginAccount;
+ GatewayCell *_loginCell;
+ AutoLoginHandler *_autoLoginHandler;
+}
+
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UIPageControl *pageControl;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *addGatewayButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *moreButton;
+
+@property (strong, nonatomic) GatewayModel *model;
+@property (nonatomic, strong) NSString *webAuthUrl;
+@property (nonatomic, strong) NSString *callbackUrl;
+@property (nonatomic, strong) NSArray *realPasswords;
+@property (nonatomic, assign) BOOL isAutoLogin;
+@property (nonatomic, assign) BOOL isLocalDB; //Only the biometric authentication screen is displayed
+
+@end
+
+@implementation GatewayViewController
+
+- (void)dealloc {
+ self.model = nil;
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [[GatewayModel alloc] init];
+ self.model.delegate = self;
+
+ [self initNavigationBarAppearance];
+ [self initCollectionView];
+ [self initPageControl];
+ [self initButtonItems];
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(autoConnectWithOauthCode:) name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelConnection) name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpToLoginIn) name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ static dispatch_once_t onceToken;
+
+ if (!_autoLoginHandler) {
+ _autoLoginHandler = [[AutoLoginHandler alloc] initWithDelegate:self];
+ }
+
+ if (_autoLoginHandler.url) {
+ // If autolaunch, do not show add gateway view.
+ dispatch_once(&onceToken, ^{
+ [_autoLoginHandler readyToAutoLogin];
+ });
+ return;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToAbout] || [segue.identifier isEqualToString:kSegueToLogSettings] || [segue.identifier isEqualToString:kSegueToChallenge] || [segue.identifier isEqualToString:kSegueToChangePassword] ||
+ [segue.identifier isEqualToString:kSegueToSMS]) {
+ return; // These destinations doesn't need more setting.
+ }
+
+ id p = nil;
+ NSDictionary *option = nil;
+
+ UINavigationController *destNavivation = (UINavigationController *)segue.destinationViewController;
+ if (destNavivation.viewControllers.count > 0) {
+ p = [destNavivation.viewControllers firstObject];
+ } else {
+ ANError(@"Can't find destination view controller.");
+ return;
+ }
+
+ if ([segue.identifier isEqualToString:kSegueToSettings]) {
+ if ([sender isKindOfClass:[Gateway class]]) {
+ option = @{@"gateway": sender};
+ }
+ [p switchFromSender:self withOption:option];
+ } else if ([segue.identifier isEqualToString:kSegueToLogin]) {
+ [p switchFromSender:self withOption:nil];
+ }
+}
+
+-(NSDictionary *) webAuthConfig
+{
+ NSDictionary *option = nil;
+ Gateway *gateway = [self.model currentGateway];
+ __weak typeof(self) weakSelf = self;
+ void (^competion)(NSError *error, NSString *session, NSString *username, NSString *acsInfo) = ^(NSError *error, NSString *session, NSString *username, NSString *acsInfo) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+
+ ANInfo(@"Error: %@, Session:%@, username:%@, oauth acsInfo:%@", error, session, username, acsInfo);
+
+ if (session && session.length > 0) {
+ if (acsInfo && acsInfo.length > 0) {
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager setOAuthAcsInfo:acsInfo];
+ }
+ if (self.webAuthUrl && [self.webAuthUrl length] > 0) {
+ [strongSelf.model loginWithSession:session andUsername:username andoAuthURL:self.webAuthUrl andcallbackURL:self.callbackUrl];
+ } else {
+ [strongSelf.model loginWithSession:session andUsername:username];
+ }
+ } else {
+ [strongSelf didFinishLogin:NO];
+ };
+
+ if (error) {
+ NSString *message = NSLocalizedString(@"Connection to server failed", nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [strongSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ };
+
+ option = @{@"host": gateway.host,
+ @"port": gateway.port,
+ @"alias": gateway.alias,
+ @"url": self.webAuthUrl,
+ @"completion": competion
+ };
+
+ return option;
+}
+
+- (void)addButtonClicked:(id)sender {
+ [self performSegueWithIdentifier:kSegueToSettings sender:self];
+}
+
+- (void)moreButtonClicked:(id)sender {
+ YCXMenuItem *logItem = [YCXMenuItem menuItem:NSLocalizedString(@"Log", nil)
+ image:[UIImage imageNamed:@"GatewayLog"]
+ tag:kMenuIndexLog
+ userInfo:nil];
+ [logItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+
+ YCXMenuItem *aboutItem = [YCXMenuItem menuItem:NSLocalizedString(@"About", nil)
+ image:[UIImage imageNamed:@"GatewayAbout"]
+ tag:kMenuIndexAbout
+ userInfo:nil];
+ [aboutItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+ NSArray *items = @[logItem, aboutItem];
+
+ [YCXMenu setTintColor:[UIColor whiteColor]];
+ [YCXMenu setSeparatorColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setSelectedColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setCornerRadius:CGFLOAT_MIN];
+ if ([YCXMenu isShow]){
+ [YCXMenu dismissMenu];
+ } else {
+ [YCXMenu showMenuInView:self.view fromRect:CGRectMake(self.view.frame.size.width - 60, 0, 60, 0) menuItems:items selected:^(NSInteger index, YCXMenuItem *item) {
+ if (index == kMenuIndexLog) {
+ [self performSegueWithIdentifier:kSegueToLogSettings sender:nil];
+ } else if (index == kMenuIndexAbout) {
+ [self performSegueWithIdentifier:kSegueToAbout sender:nil];
+ }
+ }];
+ }
+}
+
+- (void)initNavigationBarAppearance {
+ // To make the black line under navigation bar disappear (for iOS11).
+ [[UINavigationBar appearance] setBackgroundImage:[[UIImage alloc] init] forBarMetrics:UIBarMetricsDefault];
+ [[UINavigationBar appearance] setShadowImage:[[UIImage alloc] init]];
+}
+
+- (void)initCollectionView {
+ // Register cells.
+ [self.collectionView registerNib:[UINib nibWithNibName:@"EmptyGatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kEmptyGatewayCellID];
+ [self.collectionView registerNib:[UINib nibWithNibName:@"GatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kGatewayCellID];
+ // Setup layout class.
+ [self.collectionView setCollectionViewLayout:[[GatewayViewLayout alloc] init]];
+
+ self.collectionView.allowsSelection = YES;
+ self.collectionView.decelerationRate = 0.994; // Between UIScrollViewDecelerationRateNormal and UIScrollViewDecelerationRateFast
+}
+
+- (void)initPageControl {
+ [self setPageControlAppearance];
+ self.pageControl.userInteractionEnabled = NO;
+
+ NSInteger totalGateways = [self.model numberOfGateways];
+ if (totalGateways <= 0) {
+ self.pageControl.hidden = YES;
+ } else {
+ self.pageControl.hidden = NO;
+ self.pageControl.numberOfPages = totalGateways;
+ self.pageControl.currentPage = 0;
+ }
+}
+
+- (void)updatePageControlNumbers:(NSInteger)totalPages {
+ self.pageControl.hidden = totalPages > 0 ? NO : YES;
+ self.pageControl.numberOfPages = totalPages;
+}
+
+- (void)updatePageControlCurrentPage:(NSInteger)index {
+ NSInteger total = self.pageControl.numberOfPages;
+ if (index >= total || index < 0) {
+ ANDebug(@"Index \(%zi) of page control is out of page numbers \(%zi)", index, total);
+ return;
+ } else {
+ self.pageControl.currentPage = index;
+ }
+}
+
+- (void)updateCurrentGatewayIndex:(NSInteger)index {
+ [self.model selectGatewayAtIndex:index];
+ [Singleton sharedSingleton].currentPageNumber = index;
+}
+
+- (void)setGatewayCellAsSelectedWithIndex:(NSInteger)index {
+ [self clearGatewayCellsShadow];
+
+ [self setCurrentCellShadowWithIndex:index];
+}
+
+- (void)clearGatewayCellsShadow {
+ for (UICollectionViewCell *cell in self.collectionView.visibleCells) {
+ if (cell) {
+ if ([cell respondsToSelector:@selector(clearShadow)]) {
+ [cell performSelector:@selector(clearShadow)];
+ }
+ }
+ }
+}
+
+- (void)setCurrentCellShadowWithIndex:(NSInteger)index {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+ GatewayCell *currentCell = (GatewayCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+ if (currentCell) {
+ if ([currentCell respondsToSelector:@selector(addShadow)]) {
+ [currentCell performSelector:@selector(addShadow)];
+ }
+ }
+}
+
+- (void)initButtonItems {
+ [self.addGatewayButton setTarget:self];
+ [self.addGatewayButton setAction:@selector(addButtonClicked:)];
+
+ [self.moreButton setTarget:self];
+ [self.moreButton setAction:@selector(moreButtonClicked:)];
+}
+
+- (void)setPageControlAppearance {
+ self.pageControl.pageIndicatorTintColor = UIColorFromRGBA(0x999999, 1.0);
+ self.pageControl.currentPageIndicatorTintColor = MAIN_COLOR;
+}
+
+- (void)reloadWithAnimation {
+ [UIView transitionWithView:self.collectionView
+ duration:0.3
+ options:UIViewAnimationOptionTransitionCrossDissolve
+ animations:^{
+ [self.collectionView reloadData];
+ }
+ completion:nil];
+}
+
+- (void)deleteGateway {
+ [self.model deleteCurrentGateway];
+
+ NSInteger total = [self.model numberOfGateways];
+ if (total == 0) {
+ [self updateCurrentGatewayIndex:0];
+ [self reloadWithAnimation];
+ } else{
+
+ NSInteger integer = 0;
+ if (self.pageControl.currentPage == total){
+
+ integer = self.pageControl.currentPage - 1;
+ }else{
+
+ integer = self.pageControl.currentPage;
+ }
+
+ [self updateCurrentGatewayIndex:integer];
+ NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.pageControl.currentPage inSection:0];
+ [self.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [SecuritySetting clearGesture];
+ [self updatePageControlNumbers:[self.model numberOfGateways]];
+}
+
+#pragma mark - UICollectionViewDataSource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ return totalGateways > 0 ? totalGateways : 1;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+ UICollectionViewCell *cell = nil;
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ if (totalGateways > 0) {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kGatewayCellID forIndexPath:indexPath];
+ Gateway *gateway = [self.model gatewayAtIndex:indexPath.row];
+ if (gateway) {
+ [(GatewayCell *)cell configureWithGateway:gateway delegate:self];
+ }
+ } else {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kEmptyGatewayCellID forIndexPath:indexPath];
+ EmptyGatewayCell *emptyCell = (EmptyGatewayCell *)cell;
+ [emptyCell.addGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ [emptyCell.emptyGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+
+ if ([cell respondsToSelector:@selector(changeLayoutForIphone5)]) {
+ [cell performSelector:@selector(changeLayoutForIphone5)];
+ }
+
+ return cell;
+}
+
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+ [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+
+ [self setGatewayCellAsSelectedWithIndex:indexPath.item];
+}
+
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+ int page = (int)(scrollView.contentOffset.x / kCellWidth);
+ if (page != self.pageControl.currentPage) {
+ [self updatePageControlCurrentPage:page];
+ [self updateCurrentGatewayIndex:page];
+ [self setGatewayCellAsSelectedWithIndex:page];
+ }
+}
+
+#pragma mark - GatewaySettingDelegate
+- (void)didFinishedEdit:(BOOL)isNew {
+ NSInteger totalPages = [self.model numberOfGateways];
+ NSInteger currentPage = 0;
+ if (isNew) {
+ currentPage = totalPages-1;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ if (totalPages == 1) {
+ [self reloadWithAnimation];
+ } else {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView insertItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self updatePageControlNumbers:totalPages];
+ } else {
+ currentPage = self.pageControl.currentPage;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self setGatewayCellAsSelectedWithIndex:currentPage];
+
+ if (isNew) {
+
+ [self.collectionView setContentSize:CGSizeMake(currentPage * kScreenWidth, kScreenHeight)];
+ [self.collectionView setContentOffset:CGPointMake(currentPage * kScreenWidth, 0) animated:YES];
+ }
+}
+
+#pragma mark - GatewayCellDelegate
+- (void)didStartLogin:(NSString *)gatewayTitle cell:(UICollectionViewCell *)cell {
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:KEY_OAUTH_URL];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [AAAManager sharedInstance].resources = @"";
+
+ self.webAuthUrl = @"";
+ self.isAutoLogin = NO;
+ self.isLocalDB = YES;
+ [Singleton sharedSingleton].isAuthentication = NO;
+
+ if ([cell respondsToSelector:@selector(addShadow)]) {
+ [cell performSelector:@selector(addShadow)];
+ }
+
+ _loginCell = (GatewayCell *)cell;
+ [self.collectionView setScrollEnabled:NO];
+
+ Gateway *currentGateway = [self.model currentGateway];
+ if (!currentGateway.isWebAuthEnabled) {
+ [self.model login];
+ } else {
+ self.webAuthUrl = @"";
+ [self startWebAuth];
+ }
+}
+
+- (void)didCancelLogin:(NSString *)gatewayTitle {
+ _loginCell = nil;
+ [self.collectionView setScrollEnabled:YES];
+ [self.model cancelLogin];
+}
+
+- (void)willDeleteGateway:(NSString *)gatewayUrl {
+ if (!gatewayUrl) {
+ ANError(@"Gateway URL is nil, can't be deleted.");
+ return;
+ }
+ if (![gatewayUrl isEqualToString:[self.model currentGateway].url]) {
+ ANInfo(@"Gateway \"%@\" is not current gateway, don't delete.", gatewayUrl);
+ return;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Delete", nil)
+ message:NSLocalizedString(@"Are you sure to delete this site?", nil)
+ confirmAction:^{
+ Gateway *gateway = [weakSelf.model currentGateway];
+ if (!gateway) {
+ ANError(@"Can't find gateway named \"%@\".", gatewayUrl);
+ return;
+ } else {
+ [weakSelf deleteGateway];
+ }
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+}
+
+- (void)willEditGateway:(NSString *)gatewayUrl andPort:(NSString *)gatewayPort {
+ Gateway *gateway = [self.model gatewayOfUrl:gatewayUrl andPort:gatewayPort];
+ [self performSegueWithIdentifier:kSegueToSettings sender:gateway];
+}
+
+#pragma mark - WebAuth
+- (void)startWebAuth {
+ [self webAuthConfig];
+ ZTWebAuthViewController *control = [[ZTWebAuthViewController alloc] init];
+ control.infoDic = [self webAuthConfig];
+ [self.navigationController pushViewController:control animated:YES];
+}
+
+#pragma mark - Login Handler
+- (void)didFinishLogin:(BOOL)success {
+ [_loginCell setAsNormal];
+
+ [self.collectionView setScrollEnabled:YES];
+
+ if (success) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]]; // Update gateway cell after login.
+
+ [self performSegueWithIdentifier:kSegueToResource sender:self];
+ }
+}
+
+- (void)continueLoginWithUrl:(NSString *)url callback:(NSString *)callback {
+ self.webAuthUrl = url;
+ self.callbackUrl = callback;
+ [_loginCell setAsLoggingIn];
+
+ if (url) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]];
+ [self startWebAuth];
+ }
+}
+
+#pragma mark - Auto Login Handler
+- (void)perpareForAutoLogin:(void (^)(void))completion {
+ completion();
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account {
+ if (!account) {
+ return;
+ }
+
+ _loginAccount = account;
+
+ __weak __typeof(self) weakSelf = self;
+ [self perpareForAutoLogin:^{
+ [weakSelf sendAutoLogoutNotification];
+ [weakSelf doRealAutoLogin];
+ }];
+
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account oauthreq:(NSString *)request oauthcode:(NSString *)code {
+ NSString *urlString = nil;
+ if ([account.vsPort isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@?code=%@", account.vsHost, OAUTH_SESSION_URL, request, code];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@?code=%@", account.vsHost, account.vsPort, OAUTH_SESSION_URL, request, code];
+ }
+ ANInfo(@"didReceiveLoginRequest:continue login url=%@", urlString);
+ [self continueLoginWithUrl:urlString callback:account.autoLoginCallback];
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account session:(NSString *)sess {
+ if (!sess || sess.length <= 0) {
+ ANWarn(@"Can't create secure tunnel with empty session.");
+ return;
+ }
+
+ [self triggerNetworkFlowWithHost:account.vsHost andPort:account.vsPort];
+
+ ANDebug(@"Secure tunnel will be created with session.");
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.account = account;
+ [manager setSessionID:sess];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+#endif
+ [[ArrayVPNWrapper sharedInstance] startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgGateway object:nil];
+#endif
+}
+
+- (void)doRealAutoLogin {
+ if (!_loginAccount) return;
+
+ __weak __typeof(self) weakSelf = self;
+ [self.navigationController.view startLoadingWithMessage:@"Connecting..."
+ buttonTitle:NSLocalizedString(@"Cancel", nil)
+ cancelAction:^{
+ [weakSelf.model cancelLogin];
+ }];
+
+ [self.model autoLoginwithAccount:_loginAccount];
+}
+
+- (void)logoutThenLogin {
+ __weak __typeof(self) weakSelf = self;
+
+ [self.model logoutCurrentSession:^{
+ ANDebug(@"Logout successfully, do login");
+
+ [self sendAutoLogoutNotification];
+ // Wait 1 second for l3vpn thread to stop.
+ [weakSelf performSelector:@selector(doRealAutoLogin) withObject:nil afterDelay:1];
+ }];
+}
+
+- (void)autoLoginFailed:(NSString *)errorMessage {
+ if (!errorMessage) {
+ return;
+ }
+
+ ANInfo(@"Login failed: %@", errorMessage);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:errorMessage
+ confirmAction:nil
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)didReceiveDisconnectRequest:(VPNAccount *)account IsLogout:(BOOL)islogout {
+ ANInfo(@"Receive logout request");
+
+ [self sendAutoLogoutNotification];
+
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:account.vsURL andport:account.vsPort];
+ if (!gateway) { // MPP has been launched by URLScheme with session.
+ ANDebug(@"Secure tunnel will be destoryed with session.");
+
+ [[ArrayVPNWrapper sharedInstance] stopSSLVPN];
+ if (islogout) {
+ NSInteger ret = [[AAAManager sharedInstance] logoutL3VPNSession];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+ }
+ }
+}
+
+- (void)sendAutoLogoutNotification {
+ [[NSNotificationCenter defaultCenter] postNotificationName:kAutoLogoutNotification object:nil];
+}
+
+/**
+ * This method is meaningful only on first time launched by URLScheme with session after installed from AppStore.
+ * Cuz it needs the user to allow MPP app to use network privilege, it MUST have network flow. So, it make
+ * a simple "HEAD" http request here, and the result is not cared about.
+ */
+- (void)triggerNetworkFlowWithHost:(NSString *)host andPort:(NSString *)port {
+ NSString *realPort = @"443";
+
+ if (!host || host.length == 0) {
+ return;
+ }
+
+ if (port && port.length > 0) {
+ realPort = port;
+ }
+
+ NSString *urlString = [NSString stringWithFormat:@"https://%@:%@", host, realPort];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+ request.HTTPMethod = @"HEAD";
+ NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:nil];
+ [connection start];
+
+ ANDebug(@"A http request has been sent for auto-login. URL is: %@.", urlString);
+}
+
+- (void)autoConnectWithOauthCode:(NSNotification *)notification {
+ NSString *code =[notification.userInfo objectForKey:@"code"];
+
+ if (code.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get oAuth code failed.");
+
+ return;
+ }
+
+ ANInfo(@"autoConnectWithOauthCode: get oauth code successfully=%@", code);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get saved oauth url failed.");
+
+ return;
+ }
+ oauthUrl = [NSString stringWithFormat:@"%@%@", oauthUrl, code];
+ ANInfo(@"autoConnectWithOauthCode: connect with oauth url=%@", oauthUrl);
+ [self continueLoginWithUrl:oauthUrl callback:nil];
+}
+
+#pragma mark - GatewayModelDelegate
+- (void)needLoginInfo {
+
+ BOOL isAuth = [Singleton sharedSingleton].isAuthentication;
+ Gateway *gateway = [self.model currentGateway];
+
+ if (isAuth || gateway.isRadiusPWD){
+
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+ }else{
+
+ [self checkVerifyMothod];
+ }
+}
+
+- (void)needRegister {
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)needConfirm:(NSString *)message {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleActionSheet];
+ UIAlertAction *alertActionDestructive = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue, but never show me this again", nil)
+ style:UIAlertActionStyleDestructive
+ handler:^(UIAlertAction *action){
+ [weakSelf.model suppressCheckServerCertForCurrentGateway];
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionDefault = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction *action){
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionCancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction *action){
+ [weakSelf didFinishLogin:NO];
+ }];
+ [alertController addAction:alertActionDestructive];
+ [alertController addAction:alertActionDefault];
+ [alertController addAction:alertActionCancel];
+ UIPopoverPresentationController *popover = alertController.popoverPresentationController;
+ if (popover){
+ popover.sourceView = self.view;
+ popover.sourceRect = CGRectMake(self.view.bounds.size.width/2.0, self.view.bounds.size.height, 1.0, 1.0);
+ popover.permittedArrowDirections = UIPopoverArrowDirectionAny;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self presentViewController:alertController animated:YES completion:nil];
+ });
+}
+
+- (void)needLogout {
+ ANInfo(@"Need logout current session");
+
+ __weak typeof(self) weakSelf = self;
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"There is currently an active connection to %@, you can disconnect the current session,\
+ and start a new connection, or display the active connection.", nil),
+ [AAAManager sharedInstance].account.vsHost];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:message
+ confirmTitle:NSLocalizedString(@"Active Connection",nil)
+ cancelTitle:NSLocalizedString(@"New Connection", nil)
+ confirmAction:^{
+ [weakSelf logoutThenLogin];
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)needVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ [weakSelf.model loginWithVDIUsername:nil password:nil];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = alertController.textFields[0].text; // Username text field
+ NSString *password = alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+ [weakSelf.model loginWithVDIUsername:username password:password];
+ }];
+
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [alertController addAction:confirmAction];
+ [alertController addAction:cancelAction];
+
+ [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)needDoPreLoginCV {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)loginError:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginErrorOfTip:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Tips",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginFinished:(BOOL)success {
+ [self didFinishLogin:success];
+
+ [self.navigationController.view stopLoading];
+}
+
+- (void)checkVerifyMothod {
+ Gateway *gateway = [self.model currentGateway];
+ NSString *username = gateway.username;
+ NSString *port = gateway.port;
+
+ _realPasswords = @[@"", @"", @""];
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGateway]];
+ NSString *lastName = [methodDic objectForKey:@"userName"] ?: @"";
+ if ([username isEqualToString:@""]){
+
+ username = lastName;
+ }
+
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:port];
+ }
+ if ([username isEqualToString:lastName] && (gateway.isGestureEnabled || gateway.isFaceOrTouchIDEnabled)) {
+
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:port];
+ if (![_realPasswords isEqual:@[@"", @"", @""]]){
+
+ [self mutilVerifyMothod];
+ return;
+ }
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+ [Singleton setCurrentGatewayMethod:@{} andKey:gateway];
+ }
+ }
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+#pragma mark - 生物认证 手势认证
+-(void) mutilVerifyMothod
+{
+ Gateway *gw = [self.model currentGateway];
+ if (gw.isFaceOrTouchIDEnabled || gw.isGestureEnabled){
+
+ [Singleton sharedSingleton].isAuthentication = YES;
+ LocalAuthFinishBlockType completeBlock = ^(BOOL isAllow, SecuritySettingOption authType){
+
+ [Singleton sharedSingleton].isAuthentication = isAllow;
+ if (isAllow){
+
+ self.isAutoLogin = YES;
+ [self login];
+ }
+ };
+ UIViewController *control = [LocalAuthUtil getAuthVCWithCompletion:completeBlock];
+ control.modalPresentationStyle = UIModalPresentationFullScreen;
+ [self presentViewController:control animated:YES completion:nil];
+ }
+}
+
+- (void)login {
+
+ VPNAccount *account = [self inputResult];
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.errorCode = 0; // Success
+ [manager continueVPNThreadWithAccount:account];
+}
+
+- (VPNAccount *)inputResult {
+
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount * account = manager.account;
+
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGatewayUpInside]];
+
+ NSString *methodType = [methodDic objectForKey:@"methodType"];
+ if ([methodType isEqualToString:@"0"]){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ account.loginMethod = [methodDic objectForKey:@"methodName"] ?: @"";
+ account.userName = [methodDic objectForKey:@"userName"] ?: @"";
+
+ account.passWord = _realPasswords[0] ?: @"";
+ account.passWord2 = _realPasswords[1] ?: @"";
+ account.passWord3 = _realPasswords[2] ?: @"";
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+-(void) cancelConnection
+{
+ [self didFinishLogin:NO];
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+-(void) jumpToLoginIn
+{
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)handleVPNNotification:(NSNotification *)notification {
+ //only faceid/touchid/gestuer auth
+ if (!self.isAutoLogin){
+
+ return;
+ }
+
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ [self didFinishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ self.isAutoLogin = NO;
+ [self didFinishLogin:NO];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_WRONG_USER_PASS:
+ aMessage = manager.errorInformation;
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (!gw.isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:{
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ }
+ }
+ case VPN_CB_SMS: {
+ self.isLocalDB = NO;
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+- (void)pop {
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.MotionProEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.MotionProEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/GatewayViewController.m.MotionProEnterprise (working copy)
@@ -0,0 +1,1184 @@
+//
+// GatewayViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/10.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "YCXMenu.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "AutoLoginHandler.h"
+#import "ArrayVPNWrapper.h"
+#import "GatewayModel.h"
+#import "GatewayCell.h"
+#import "UIView+Loading.h"
+#import "LoginViewController.h"
+#import "ResourcesViewController.h"
+#import "RulesManager.h"
+#import "EmptyGatewayCell.h"
+#import "GatewayViewLayout.h"
+#import "GatewayViewController.h"
+#import "GatewaySettingsViewController.h"
+#import "LocalAuthUtil.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "UIDevice+Hardware.h"
+#import "Singleton.h"
+#import "UIViewController+Activity.h"
+#import "SMSViewController.h"
+#import "ZTWebAuthViewController.h"
+
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+
+typedef NS_ENUM(NSInteger, MenuIndex) {
+ kMenuIndexLog = 0,
+ kMenuIndexAbout
+};
+
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define CancelConnection @"CancelConnection"
+#define JumpToLoginIn @"jumpToLoginIn"
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameGateway = @"group.net.arraynetworks.groupenterprise";
+NSString * const kArrayVPNTunelErrorMsgGateway = @"net.arraynetworks.sslvpn.errormsg";
+NSString * const koAuthSetCodeGateway = @"net.arraynetworks.oauthsetcode";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameGateway = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+static NSString * const kSegueToSettings = @"GatewayToSettings";
+static NSString * const kSegueToLogin = @"GatewayToLogin";
+static NSString * const kSegueToResource = @"GatewayToResource";
+static NSString * const kSegueToAbout = @"GatewayToAbout";
+static NSString * const kSegueToLogSettings = @"GatewayToLogSettings";
+static NSString * const kSegueToWebAuth = @"GatewayToWebAuth";
+
+@interface GatewayViewController () {
+ VPNAccount *_loginAccount;
+ GatewayCell *_loginCell;
+ AutoLoginHandler *_autoLoginHandler;
+}
+
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UIPageControl *pageControl;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *addGatewayButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *moreButton;
+
+@property (strong, nonatomic) GatewayModel *model;
+@property (nonatomic, strong) NSString *webAuthUrl;
+@property (nonatomic, strong) NSString *callbackUrl;
+@property (nonatomic, strong) NSArray *realPasswords;
+@property (nonatomic, assign) BOOL isAutoLogin;
+@property (nonatomic, assign) BOOL isLocalDB; //Only the biometric authentication screen is displayed
+
+@end
+
+@implementation GatewayViewController
+
+- (void)dealloc {
+ self.model = nil;
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [[GatewayModel alloc] init];
+ self.model.delegate = self;
+
+ [self initNavigationBarAppearance];
+ [self initCollectionView];
+ [self initPageControl];
+ [self initButtonItems];
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(autoConnectWithOauthCode:) name:koAuthSetCodeGateway object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelConnection) name:CancelConnection object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jumpToLoginIn) name:JumpToLoginIn object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+#endif
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ static dispatch_once_t onceToken;
+
+ if (!_autoLoginHandler) {
+ _autoLoginHandler = [[AutoLoginHandler alloc] initWithDelegate:self];
+ }
+
+ if (_autoLoginHandler.url) {
+ // If autolaunch, do not show add gateway view.
+ dispatch_once(&onceToken, ^{
+ [_autoLoginHandler readyToAutoLogin];
+ });
+ return;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToAbout] || [segue.identifier isEqualToString:kSegueToLogSettings] || [segue.identifier isEqualToString:kSegueToChallenge] || [segue.identifier isEqualToString:kSegueToChangePassword] ||
+ [segue.identifier isEqualToString:kSegueToSMS]) {
+ return; // These destinations doesn't need more setting.
+ }
+
+ id p = nil;
+ NSDictionary *option = nil;
+
+ UINavigationController *destNavivation = (UINavigationController *)segue.destinationViewController;
+ if (destNavivation.viewControllers.count > 0) {
+ p = [destNavivation.viewControllers firstObject];
+ } else {
+ ANError(@"Can't find destination view controller.");
+ return;
+ }
+
+ if ([segue.identifier isEqualToString:kSegueToSettings]) {
+ if ([sender isKindOfClass:[Gateway class]]) {
+ option = @{@"gateway": sender};
+ }
+ [p switchFromSender:self withOption:option];
+ } else if ([segue.identifier isEqualToString:kSegueToLogin]) {
+ [p switchFromSender:self withOption:nil];
+ }
+}
+
+-(NSDictionary *) webAuthConfig
+{
+ NSDictionary *option = nil;
+ Gateway *gateway = [self.model currentGateway];
+ __weak typeof(self) weakSelf = self;
+ void (^competion)(NSError *error, NSString *session, NSString *username, NSString *acsInfo) = ^(NSError *error, NSString *session, NSString *username, NSString *acsInfo) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+
+ ANInfo(@"Error: %@, Session:%@, username:%@, oauth acsInfo:%@", error, session, username, acsInfo);
+
+ if (session && session.length > 0) {
+ if (acsInfo && acsInfo.length > 0) {
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager setOAuthAcsInfo:acsInfo];
+ }
+ if (self.webAuthUrl && [self.webAuthUrl length] > 0) {
+ [strongSelf.model loginWithSession:session andUsername:username andoAuthURL:self.webAuthUrl andcallbackURL:self.callbackUrl];
+ } else {
+ [strongSelf.model loginWithSession:session andUsername:username];
+ }
+ } else {
+ [strongSelf didFinishLogin:NO];
+ };
+
+ if (error) {
+ NSString *message = NSLocalizedString(@"Connection to server failed", nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [strongSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ };
+
+ option = @{@"host": gateway.host,
+ @"port": gateway.port,
+ @"alias": gateway.alias,
+ @"url": self.webAuthUrl,
+ @"completion": competion
+ };
+
+ return option;
+}
+
+- (void)addButtonClicked:(id)sender {
+ [self performSegueWithIdentifier:kSegueToSettings sender:self];
+}
+
+- (void)moreButtonClicked:(id)sender {
+ YCXMenuItem *logItem = [YCXMenuItem menuItem:NSLocalizedString(@"Log", nil)
+ image:[UIImage imageNamed:@"GatewayLog"]
+ tag:kMenuIndexLog
+ userInfo:nil];
+ [logItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+
+ YCXMenuItem *aboutItem = [YCXMenuItem menuItem:NSLocalizedString(@"About", nil)
+ image:[UIImage imageNamed:@"GatewayAbout"]
+ tag:kMenuIndexAbout
+ userInfo:nil];
+ [aboutItem setForeColor:UIColorFromRGBA(0x666666, 1.0)];
+ NSArray *items = @[logItem, aboutItem];
+
+ [YCXMenu setTintColor:[UIColor whiteColor]];
+ [YCXMenu setSeparatorColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setSelectedColor:UIColorFromRGBA(0xe2e2e2, 1.0)];
+ [YCXMenu setCornerRadius:CGFLOAT_MIN];
+ if ([YCXMenu isShow]){
+ [YCXMenu dismissMenu];
+ } else {
+ [YCXMenu showMenuInView:self.view fromRect:CGRectMake(self.view.frame.size.width - 60, 0, 60, 0) menuItems:items selected:^(NSInteger index, YCXMenuItem *item) {
+ if (index == kMenuIndexLog) {
+ [self performSegueWithIdentifier:kSegueToLogSettings sender:nil];
+ } else if (index == kMenuIndexAbout) {
+ [self performSegueWithIdentifier:kSegueToAbout sender:nil];
+ }
+ }];
+ }
+}
+
+- (void)initNavigationBarAppearance {
+ // To make the black line under navigation bar disappear (for iOS11).
+ [[UINavigationBar appearance] setBackgroundImage:[[UIImage alloc] init] forBarMetrics:UIBarMetricsDefault];
+ [[UINavigationBar appearance] setShadowImage:[[UIImage alloc] init]];
+}
+
+- (void)initCollectionView {
+ // Register cells.
+ [self.collectionView registerNib:[UINib nibWithNibName:@"EmptyGatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kEmptyGatewayCellID];
+ [self.collectionView registerNib:[UINib nibWithNibName:@"GatewayCell" bundle:nil]
+ forCellWithReuseIdentifier:kGatewayCellID];
+ // Setup layout class.
+ [self.collectionView setCollectionViewLayout:[[GatewayViewLayout alloc] init]];
+
+ self.collectionView.allowsSelection = YES;
+ self.collectionView.decelerationRate = 0.994; // Between UIScrollViewDecelerationRateNormal and UIScrollViewDecelerationRateFast
+}
+
+- (void)initPageControl {
+ [self setPageControlAppearance];
+ self.pageControl.userInteractionEnabled = NO;
+
+ NSInteger totalGateways = [self.model numberOfGateways];
+ if (totalGateways <= 0) {
+ self.pageControl.hidden = YES;
+ } else {
+ self.pageControl.hidden = NO;
+ self.pageControl.numberOfPages = totalGateways;
+ self.pageControl.currentPage = 0;
+ }
+}
+
+- (void)updatePageControlNumbers:(NSInteger)totalPages {
+ self.pageControl.hidden = totalPages > 0 ? NO : YES;
+ self.pageControl.numberOfPages = totalPages;
+}
+
+- (void)updatePageControlCurrentPage:(NSInteger)index {
+ NSInteger total = self.pageControl.numberOfPages;
+ if (index >= total || index < 0) {
+ ANDebug(@"Index \(%zi) of page control is out of page numbers \(%zi)", index, total);
+ return;
+ } else {
+ self.pageControl.currentPage = index;
+ }
+}
+
+- (void)updateCurrentGatewayIndex:(NSInteger)index {
+ [self.model selectGatewayAtIndex:index];
+ [Singleton sharedSingleton].currentPageNumber = index;
+}
+
+- (void)setGatewayCellAsSelectedWithIndex:(NSInteger)index {
+ [self clearGatewayCellsShadow];
+
+ [self setCurrentCellShadowWithIndex:index];
+}
+
+- (void)clearGatewayCellsShadow {
+ for (UICollectionViewCell *cell in self.collectionView.visibleCells) {
+ if (cell) {
+ if ([cell respondsToSelector:@selector(clearShadow)]) {
+ [cell performSelector:@selector(clearShadow)];
+ }
+ }
+ }
+}
+
+- (void)setCurrentCellShadowWithIndex:(NSInteger)index {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+ GatewayCell *currentCell = (GatewayCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+ if (currentCell) {
+ if ([currentCell respondsToSelector:@selector(addShadow)]) {
+ [currentCell performSelector:@selector(addShadow)];
+ }
+ }
+}
+
+- (void)initButtonItems {
+ [self.addGatewayButton setTarget:self];
+ [self.addGatewayButton setAction:@selector(addButtonClicked:)];
+
+ [self.moreButton setTarget:self];
+ [self.moreButton setAction:@selector(moreButtonClicked:)];
+}
+
+- (void)setPageControlAppearance {
+ self.pageControl.pageIndicatorTintColor = UIColorFromRGBA(0x999999, 1.0);
+ self.pageControl.currentPageIndicatorTintColor = MAIN_COLOR;
+}
+
+- (void)reloadWithAnimation {
+ [UIView transitionWithView:self.collectionView
+ duration:0.3
+ options:UIViewAnimationOptionTransitionCrossDissolve
+ animations:^{
+ [self.collectionView reloadData];
+ }
+ completion:nil];
+}
+
+- (void)deleteGateway {
+ [self.model deleteCurrentGateway];
+
+ NSInteger total = [self.model numberOfGateways];
+ if (total == 0) {
+ [self updateCurrentGatewayIndex:0];
+ [self reloadWithAnimation];
+ } else{
+
+ NSInteger integer = 0;
+ if (self.pageControl.currentPage == total){
+
+ integer = self.pageControl.currentPage - 1;
+ }else{
+
+ integer = self.pageControl.currentPage;
+ }
+
+ [self updateCurrentGatewayIndex:integer];
+ NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.pageControl.currentPage inSection:0];
+ [self.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [SecuritySetting clearGesture];
+ [self updatePageControlNumbers:[self.model numberOfGateways]];
+}
+
+#pragma mark - UICollectionViewDataSource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ return totalGateways > 0 ? totalGateways : 1;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+ UICollectionViewCell *cell = nil;
+ NSInteger totalGateways = [self.model numberOfGateways];
+
+ if (totalGateways > 0) {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kGatewayCellID forIndexPath:indexPath];
+ Gateway *gateway = [self.model gatewayAtIndex:indexPath.row];
+ if (gateway) {
+ [(GatewayCell *)cell configureWithGateway:gateway delegate:self];
+ }
+ } else {
+ cell = [collectionView dequeueReusableCellWithReuseIdentifier:kEmptyGatewayCellID forIndexPath:indexPath];
+ EmptyGatewayCell *emptyCell = (EmptyGatewayCell *)cell;
+ [emptyCell.addGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ [emptyCell.emptyGatewayButton addTarget:self action:@selector(addButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+
+ if ([cell respondsToSelector:@selector(changeLayoutForIphone5)]) {
+ [cell performSelector:@selector(changeLayoutForIphone5)];
+ }
+
+ return cell;
+}
+
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+ [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+
+ [self setGatewayCellAsSelectedWithIndex:indexPath.item];
+}
+
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+ int page = (int)(scrollView.contentOffset.x / kCellWidth);
+ if (page != self.pageControl.currentPage) {
+ [self updatePageControlCurrentPage:page];
+ [self updateCurrentGatewayIndex:page];
+ [self setGatewayCellAsSelectedWithIndex:page];
+ }
+}
+
+#pragma mark - GatewaySettingDelegate
+- (void)didFinishedEdit:(BOOL)isNew {
+ NSInteger totalPages = [self.model numberOfGateways];
+ NSInteger currentPage = 0;
+ if (isNew) {
+ currentPage = totalPages-1;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ if (totalPages == 1) {
+ [self reloadWithAnimation];
+ } else {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView insertItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self updatePageControlNumbers:totalPages];
+ } else {
+ currentPage = self.pageControl.currentPage;
+ [self updateCurrentGatewayIndex:currentPage];
+
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:currentPage inSection:0];
+ [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
+ }
+
+ [self setGatewayCellAsSelectedWithIndex:currentPage];
+
+ if (isNew) {
+
+ [self.collectionView setContentSize:CGSizeMake(currentPage * kScreenWidth, kScreenHeight)];
+ [self.collectionView setContentOffset:CGPointMake(currentPage * kScreenWidth, 0) animated:YES];
+ }
+}
+
+#pragma mark - GatewayCellDelegate
+- (void)didStartLogin:(NSString *)gatewayTitle cell:(UICollectionViewCell *)cell {
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:KEY_OAUTH_URL];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [AAAManager sharedInstance].resources = @"";
+
+ self.webAuthUrl = @"";
+ self.isAutoLogin = NO;
+ self.isLocalDB = YES;
+ [Singleton sharedSingleton].isAuthentication = NO;
+
+ if ([cell respondsToSelector:@selector(addShadow)]) {
+ [cell performSelector:@selector(addShadow)];
+ }
+
+ _loginCell = (GatewayCell *)cell;
+ [self.collectionView setScrollEnabled:NO];
+
+ Gateway *currentGateway = [self.model currentGateway];
+ if (!currentGateway.isWebAuthEnabled) {
+ [self.model login];
+ } else {
+ self.webAuthUrl = @"";
+ [self startWebAuth];
+ }
+}
+
+- (void)didCancelLogin:(NSString *)gatewayTitle {
+ _loginCell = nil;
+ [self.collectionView setScrollEnabled:YES];
+ [self.model cancelLogin];
+}
+
+- (void)willDeleteGateway:(NSString *)gatewayUrl {
+ if (!gatewayUrl) {
+ ANError(@"Gateway URL is nil, can't be deleted.");
+ return;
+ }
+ if (![gatewayUrl isEqualToString:[self.model currentGateway].url]) {
+ ANInfo(@"Gateway \"%@\" is not current gateway, don't delete.", gatewayUrl);
+ return;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Delete", nil)
+ message:NSLocalizedString(@"Are you sure to delete this site?", nil)
+ confirmAction:^{
+ Gateway *gateway = [weakSelf.model currentGateway];
+ if (!gateway) {
+ ANError(@"Can't find gateway named \"%@\".", gatewayUrl);
+ return;
+ } else {
+ [weakSelf deleteGateway];
+ }
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+}
+
+- (void)willEditGateway:(NSString *)gatewayUrl andPort:(NSString *)gatewayPort {
+ Gateway *gateway = [self.model gatewayOfUrl:gatewayUrl andPort:gatewayPort];
+ [self performSegueWithIdentifier:kSegueToSettings sender:gateway];
+}
+
+#pragma mark - WebAuth
+- (void)startWebAuth {
+ [self webAuthConfig];
+ ZTWebAuthViewController *control = [[ZTWebAuthViewController alloc] init];
+ control.infoDic = [self webAuthConfig];
+ [self.navigationController pushViewController:control animated:YES];
+}
+
+#pragma mark - Login Handler
+- (void)didFinishLogin:(BOOL)success {
+ [_loginCell setAsNormal];
+
+ [self.collectionView setScrollEnabled:YES];
+
+ if (success) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]]; // Update gateway cell after login.
+
+ [self performSegueWithIdentifier:kSegueToResource sender:self];
+ }
+}
+
+- (void)continueLoginWithUrl:(NSString *)url callback:(NSString *)callback {
+ self.webAuthUrl = url;
+ self.callbackUrl = callback;
+ [_loginCell setAsLoggingIn];
+
+ if (url) {
+ [self.model didAccessCurrentGateway];
+
+ [_loginCell setAccessDate:[self.model currentGatewayAccessDate]];
+ [self startWebAuth];
+ }
+}
+
+#pragma mark - Auto Login Handler
+- (void)perpareForAutoLogin:(void (^)(void))completion {
+ completion();
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account {
+ if (!account) {
+ return;
+ }
+
+ _loginAccount = account;
+
+ __weak __typeof(self) weakSelf = self;
+ [self perpareForAutoLogin:^{
+ [weakSelf sendAutoLogoutNotification];
+ [weakSelf doRealAutoLogin];
+ }];
+
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account oauthreq:(NSString *)request oauthcode:(NSString *)code {
+ NSString *urlString = nil;
+ if ([account.vsPort isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@?code=%@", account.vsHost, OAUTH_SESSION_URL, request, code];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@?code=%@", account.vsHost, account.vsPort, OAUTH_SESSION_URL, request, code];
+ }
+ ANInfo(@"didReceiveLoginRequest:continue login url=%@", urlString);
+ [self continueLoginWithUrl:urlString callback:account.autoLoginCallback];
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)didReceiveLoginRequest:(VPNAccount *)account session:(NSString *)sess {
+ if (!sess || sess.length <= 0) {
+ ANWarn(@"Can't create secure tunnel with empty session.");
+ return;
+ }
+
+ [self triggerNetworkFlowWithHost:account.vsHost andPort:account.vsPort];
+
+ ANDebug(@"Secure tunnel will be created with session.");
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.account = account;
+ [manager setSessionID:sess];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+#endif
+ [[ArrayVPNWrapper sharedInstance] startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgGateway object:nil];
+#endif
+}
+
+- (void)doRealAutoLogin {
+ if (!_loginAccount) return;
+
+ __weak __typeof(self) weakSelf = self;
+ [self.navigationController.view startLoadingWithMessage:@"Connecting..."
+ buttonTitle:NSLocalizedString(@"Cancel", nil)
+ cancelAction:^{
+ [weakSelf.model cancelLogin];
+ }];
+
+ [self.model autoLoginwithAccount:_loginAccount];
+}
+
+- (void)logoutThenLogin {
+ __weak __typeof(self) weakSelf = self;
+
+ [self.model logoutCurrentSession:^{
+ ANDebug(@"Logout successfully, do login");
+
+ [self sendAutoLogoutNotification];
+ // Wait 1 second for l3vpn thread to stop.
+ [weakSelf performSelector:@selector(doRealAutoLogin) withObject:nil afterDelay:1];
+ }];
+}
+
+- (void)autoLoginFailed:(NSString *)errorMessage {
+ if (!errorMessage) {
+ return;
+ }
+
+ ANInfo(@"Login failed: %@", errorMessage);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:errorMessage
+ confirmAction:nil
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)didReceiveDisconnectRequest:(VPNAccount *)account IsLogout:(BOOL)islogout {
+ ANInfo(@"Receive logout request");
+
+ [self sendAutoLogoutNotification];
+
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:account.vsURL andport:account.vsPort];
+ if (!gateway) { // MPP has been launched by URLScheme with session.
+ ANDebug(@"Secure tunnel will be destoryed with session.");
+
+ [[ArrayVPNWrapper sharedInstance] stopSSLVPN];
+ if (islogout) {
+ NSInteger ret = [[AAAManager sharedInstance] logoutL3VPNSession];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+ }
+ }
+}
+
+- (void)sendAutoLogoutNotification {
+ [[NSNotificationCenter defaultCenter] postNotificationName:kAutoLogoutNotification object:nil];
+}
+
+/**
+ * This method is meaningful only on first time launched by URLScheme with session after installed from AppStore.
+ * Cuz it needs the user to allow MPP app to use network privilege, it MUST have network flow. So, it make
+ * a simple "HEAD" http request here, and the result is not cared about.
+ */
+- (void)triggerNetworkFlowWithHost:(NSString *)host andPort:(NSString *)port {
+ NSString *realPort = @"443";
+
+ if (!host || host.length == 0) {
+ return;
+ }
+
+ if (port && port.length > 0) {
+ realPort = port;
+ }
+
+ NSString *urlString = [NSString stringWithFormat:@"https://%@:%@", host, realPort];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+ request.HTTPMethod = @"HEAD";
+ NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:nil];
+ [connection start];
+
+ ANDebug(@"A http request has been sent for auto-login. URL is: %@.", urlString);
+}
+
+- (void)autoConnectWithOauthCode:(NSNotification *)notification {
+ NSString *code =[notification.userInfo objectForKey:@"code"];
+
+ if (code.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get oAuth code failed.");
+
+ return;
+ }
+
+ ANInfo(@"autoConnectWithOauthCode: get oauth code successfully=%@", code);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameGateway];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length <= 0) {
+ ANError(@"autoConnectWithOauthCode: Get saved oauth url failed.");
+
+ return;
+ }
+ oauthUrl = [NSString stringWithFormat:@"%@%@", oauthUrl, code];
+ ANInfo(@"autoConnectWithOauthCode: connect with oauth url=%@", oauthUrl);
+ [self continueLoginWithUrl:oauthUrl callback:nil];
+}
+
+#pragma mark - GatewayModelDelegate
+- (void)needLoginInfo {
+
+ BOOL isAuth = [Singleton sharedSingleton].isAuthentication;
+ Gateway *gateway = [self.model currentGateway];
+
+ if (isAuth || gateway.isRadiusPWD){
+
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+ }else{
+
+ [self checkVerifyMothod];
+ }
+}
+
+- (void)needRegister {
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)needConfirm:(NSString *)message {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleActionSheet];
+ UIAlertAction *alertActionDestructive = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue, but never show me this again", nil)
+ style:UIAlertActionStyleDestructive
+ handler:^(UIAlertAction *action){
+ [weakSelf.model suppressCheckServerCertForCurrentGateway];
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionDefault = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction *action){
+ [weakSelf.model continueLogin];
+ }];
+ UIAlertAction *alertActionCancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction *action){
+ [weakSelf didFinishLogin:NO];
+ }];
+ [alertController addAction:alertActionDestructive];
+ [alertController addAction:alertActionDefault];
+ [alertController addAction:alertActionCancel];
+ UIPopoverPresentationController *popover = alertController.popoverPresentationController;
+ if (popover){
+ popover.sourceView = self.view;
+ popover.sourceRect = CGRectMake(self.view.bounds.size.width/2.0, self.view.bounds.size.height, 1.0, 1.0);
+ popover.permittedArrowDirections = UIPopoverArrowDirectionAny;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self presentViewController:alertController animated:YES completion:nil];
+ });
+}
+
+- (void)needLogout {
+ ANInfo(@"Need logout current session");
+
+ __weak typeof(self) weakSelf = self;
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"There is currently an active connection to %@, you can disconnect the current session,\
+ and start a new connection, or display the active connection.", nil),
+ [AAAManager sharedInstance].account.vsHost];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:message
+ confirmTitle:NSLocalizedString(@"Active Connection",nil)
+ cancelTitle:NSLocalizedString(@"New Connection", nil)
+ confirmAction:^{
+ [weakSelf logoutThenLogin];
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)needVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ [weakSelf.model loginWithVDIUsername:nil password:nil];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = alertController.textFields[0].text; // Username text field
+ NSString *password = alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+ [weakSelf.model loginWithVDIUsername:username password:password];
+ }];
+
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [alertController addAction:confirmAction];
+ [alertController addAction:cancelAction];
+
+ [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)needDoPreLoginCV {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)loginError:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginErrorOfTip:(NSString *)message {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self didFinishLogin:NO];
+ });
+ if (!message) {
+ return;
+ }
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Tips",nil) message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)loginFinished:(BOOL)success {
+ [self didFinishLogin:success];
+
+ [self.navigationController.view stopLoading];
+}
+
+- (void)checkVerifyMothod {
+ Gateway *gateway = [self.model currentGateway];
+ NSString *username = gateway.username;
+ NSString *port = gateway.port;
+
+ _realPasswords = @[@"", @"", @""];
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGateway]];
+ NSString *lastName = [methodDic objectForKey:@"userName"] ?: @"";
+ if ([username isEqualToString:@""]){
+
+ username = lastName;
+ }
+
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:port];
+ }
+ if ([username isEqualToString:lastName] && (gateway.isGestureEnabled || gateway.isFaceOrTouchIDEnabled)) {
+
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:port];
+ if (![_realPasswords isEqual:@[@"", @"", @""]]){
+
+ [self mutilVerifyMothod];
+ return;
+ }
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+ [Singleton setCurrentGatewayMethod:@{} andKey:gateway];
+ }
+ }
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+#pragma mark - 生物认证 手势认证
+-(void) mutilVerifyMothod
+{
+ Gateway *gw = [self.model currentGateway];
+ if (gw.isFaceOrTouchIDEnabled || gw.isGestureEnabled){
+
+ [Singleton sharedSingleton].isAuthentication = YES;
+ LocalAuthFinishBlockType completeBlock = ^(BOOL isAllow, SecuritySettingOption authType){
+
+ [Singleton sharedSingleton].isAuthentication = isAllow;
+ if (isAllow){
+
+ self.isAutoLogin = YES;
+ [self login];
+ }
+ };
+ UIViewController *control = [LocalAuthUtil getAuthVCWithCompletion:completeBlock];
+ control.modalPresentationStyle = UIModalPresentationFullScreen;
+ [self presentViewController:control animated:YES completion:nil];
+ }
+}
+
+- (void)login {
+
+ VPNAccount *account = [self inputResult];
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.errorCode = 0; // Success
+ [manager continueVPNThreadWithAccount:account];
+}
+
+- (VPNAccount *)inputResult {
+
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount * account = manager.account;
+
+ NSDictionary *methodDic = [Singleton getCurrentGatewayMethod:[self.model currentGatewayUpInside]];
+
+ NSString *methodType = [methodDic objectForKey:@"methodType"];
+ if ([methodType isEqualToString:@"0"]){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ account.loginMethod = [methodDic objectForKey:@"methodName"] ?: @"";
+ account.userName = [methodDic objectForKey:@"userName"] ?: @"";
+
+ account.passWord = _realPasswords[0] ?: @"";
+ account.passWord2 = _realPasswords[1] ?: @"";
+ account.passWord3 = _realPasswords[2] ?: @"";
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+-(void) cancelConnection
+{
+ [self didFinishLogin:NO];
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+-(void) jumpToLoginIn
+{
+ [self performSegueWithIdentifier:kSegueToLogin sender:self];
+}
+
+- (void)handleVPNNotification:(NSNotification *)notification {
+ //only faceid/touchid/gestuer auth
+ if (!self.isAutoLogin){
+
+ return;
+ }
+
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ [self didFinishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ if (!self.isLocalDB){
+
+ [self pop];
+ }
+ self.isAutoLogin = NO;
+ [self didFinishLogin:NO];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_WRONG_USER_PASS:
+ aMessage = manager.errorInformation;
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (!gw.isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:{
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ }
+ }
+ case VPN_CB_SMS: {
+ self.isLocalDB = NO;
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ self.isLocalDB = NO;
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+- (void)pop {
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogLevelViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogLevelViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogLevelViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// LogLevelViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/11.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface LogLevelViewController : UITableViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogLevelViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogLevelViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogLevelViewController.m (working copy)
@@ -0,0 +1,154 @@
+//
+// LogLevelViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/11.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "LogLevelViewController.h"
+
+#define TOTAL_SECTION 1
+#define TOTAL_ROWS 4
+
+typedef NS_ENUM(NSInteger, LogLevelIndex) {
+ kLogLevelIndexDebug = 0,
+ kLogLevelIndexInfo,
+ kLogLevelIndexWarn,
+ kLogLevelIndexError,
+};
+
+@interface LogLevelViewController ()
+
+@property (nonatomic) NSInteger selectedIndex;
+@property (weak, nonatomic) IBOutlet UIImageView *debugImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *infoImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *warnImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *errorImageView;
+
+@end
+
+@implementation LogLevelViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self showLogLevel];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)showLogLevel {
+ NSInteger currentLevel = [self getCurrentLogLevel];
+
+ switch (currentLevel) {
+ case ArrayLogLevelDebug:
+ [self showLogLevelAsDebug];
+ break;
+ case ArrayLogLevelInfo:
+ [self showLogLevelAsInfo];
+ break;
+ case ArrayLogLevelWarn:
+ [self showLogLevelAsWarn];
+ break;
+ case ArrayLogLevelError:
+ [self showLogLevelAsError];
+ break;
+
+ default:
+ break;
+ }
+}
+
+- (void)showLogLevelAsDebug {
+ self.debugImageView.hidden = NO;
+ self.infoImageView.hidden = YES;
+ self.warnImageView.hidden = YES;
+ self.errorImageView.hidden = YES;
+
+ self.selectedIndex = kLogLevelIndexDebug;
+}
+
+- (void)showLogLevelAsInfo {
+ self.debugImageView.hidden = YES;
+ self.infoImageView.hidden = NO;
+ self.warnImageView.hidden = YES;
+ self.errorImageView.hidden = YES;
+
+ self.selectedIndex = kLogLevelIndexInfo;
+}
+
+- (void)showLogLevelAsWarn {
+ self.debugImageView.hidden = YES;
+ self.infoImageView.hidden = YES;
+ self.warnImageView.hidden = NO;
+ self.errorImageView.hidden = YES;
+
+ self.selectedIndex = kLogLevelIndexWarn;
+}
+
+- (void)showLogLevelAsError {
+ self.debugImageView.hidden = YES;
+ self.infoImageView.hidden = YES;
+ self.warnImageView.hidden = YES;
+ self.errorImageView.hidden = NO;
+
+ self.selectedIndex = kLogLevelIndexError;
+}
+
+- (NSInteger)getCurrentLogLevel {
+ return [[ANLogger sharedInstance] currentLogLevel];
+}
+
+- (void)setLogLevel:(NSInteger)level {
+ [[ANLogger sharedInstance] setLogLevel:level];
+ [[AAAManager sharedInstance] setLogLevel:(int)level];
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTION;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ switch (indexPath.row) {
+ case kLogLevelIndexDebug:
+ [self showLogLevelAsDebug];
+ break;
+ case kLogLevelIndexInfo:
+ [self showLogLevelAsInfo];
+ break;
+ case kLogLevelIndexWarn:
+ [self showLogLevelAsWarn];
+ break;
+ case kLogLevelIndexError:
+ [self showLogLevelAsError];
+ break;
+
+ default:
+ break;
+ }
+
+ [self setLogLevel:self.selectedIndex];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogSettingsViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogSettingsViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogSettingsViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// LogSettingsViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/11.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface LogSettingsViewController : UITableViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogSettingsViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogSettingsViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LogSettingsViewController.m (working copy)
@@ -0,0 +1,113 @@
+//
+// LogSettingsViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/11.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+#import "Global.h"
+#import "ANLogger.h"
+#import "ANPopupDialog.h"
+#import "LogSettingsViewController.h"
+
+#define TOTAL_SECTION 1
+#define TOTAL_ROWS 3
+
+typedef NS_ENUM(NSInteger, LogSettingsIndex) {
+ kLogSettingsEnable = 0,
+ kLogSettingsLevel,
+ kLogSettingsSend,
+};
+
+@interface LogSettingsViewController ()
+
+@property (weak, nonatomic) IBOutlet UISwitch *enableLogSwitch;
+@property (weak, nonatomic) IBOutlet UITableViewCell *logLevelCell;
+@property (weak, nonatomic) IBOutlet UITableViewCell *sendLogCell;
+
+@property (strong, nonatomic) UIActivityViewController *activityViewController;
+
+@end
+
+@implementation LogSettingsViewController
+
+@synthesize activityViewController;
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ BOOL isEnabled = [ANLogger sharedInstance].enabled;
+ self.enableLogSwitch.on = isEnabled;
+ [self setLogLevelCellAsEnabled:isEnabled];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)enableLogSwitched:(id)sender {
+ BOOL isOn = self.enableLogSwitch.on;
+ [[ANLogger sharedInstance] setEnabled:isOn];
+
+ [self setLogLevelCellAsEnabled:isOn];
+}
+
+- (void)setLogLevelCellAsEnabled:(BOOL)isEnabled {
+ self.logLevelCell.userInteractionEnabled = isEnabled;
+ self.logLevelCell.contentView.alpha = isEnabled ? 1.0 : 0.5;
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTION;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (UIActivityViewController *)activityViewController {
+ NSString *anLog = [[ANLogger sharedInstance] pathToLogFile];
+ NSString *tunnelLogPath = [[[ANLogger sharedInstance] logDirectory] stringByAppendingPathComponent:kANTunnelFileName];
+ NSURL *anLogURL = [NSURL fileURLWithPath:anLog];
+ NSURL *tunneLogURL = [NSURL fileURLWithPath:tunnelLogPath];
+ NSArray *activityItems = @[anLogURL, tunneLogURL];
+
+ activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ activityViewController.popoverPresentationController.sourceView = self.sendLogCell;
+ }
+ activityViewController.completionWithItemsHandler = ^(UIActivityType activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
+ ANInfo(@"Share log activityType: %@", activityType);
+ if (completed) {
+ ANInfo(@"Share log result: completed");
+ } else {
+ ANInfo(@"Share log result: cancelled");
+ }
+ };
+
+ return activityViewController;
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.section == 0 && indexPath.row == kLogSettingsSend) {
+ [self presentViewController:self.activityViewController animated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.h (working copy)
@@ -0,0 +1,23 @@
+//
+// LoginViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/19.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+#import "Global.h"
+
+@protocol LoginControllerDelegate
+
+- (void)didFinishLogin:(BOOL)success;
+- (void)continueLoginWithUrl:(NSString *)url callback:(NSString *)callback;
+
+@end
+
+@interface LoginViewController : UIViewController
+
+@property (weak, nonatomic) id delegate;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m (working copy)
@@ -0,0 +1,1342 @@
+//
+// LoginViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/19.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "ArrayVPNWrapper.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "DropMenuView.h"
+#import "ANPopupDialog.h"
+#import "FilterTypeModel.h"
+#import "UIDevice+Hardware.h"
+#import "SMSViewController.h"
+#import "SyferLockLoginViewController.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "LoginViewController.h"
+#import "GatewayModel.h"
+#import "Singleton.h"
+
+static NSString * const methodCellID = @"LoginMethodCell";
+static NSString * const usernameCellID = @"LoginUsernameCell";
+static NSString * const passwordCellID = @"LoginPasswordCell";
+
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+static NSString * const kSegueToRegister = @"LoginToRegister";
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToSMX = @"LoginToSMX";
+static NSString * const kSegueToSMXChangePassword = @"LoginToSMXChangePassword";
+static NSString * const kSegueToSMXConfirmPassword = @"LoginToSMXConfirmPassword";
+static NSString * const kSegueToSyferLock = @"LoginToSyferLock";
+
+NSString * const kAppGroupNameLogin = @"group.net.arraynetworks.MotionProPlus";
+
+#define VIEW_CONTROLLER_ID_SMX_LOGIN @"SMXLoginViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_NEWPASS @"SMXNewPasswordViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_CONFIRM @"SMXConfirmPasswordViewControllerID"
+
+#define TABLEVIEW_HEADER_HEIGHT 15
+#define TABLEVIEW_FOOTER_HEIGHT CGFLOAT_MIN
+#define TABLEVIEW_CELL_HEIGHT 60
+#define TABLEVIEW_CELL_PADDING 10
+
+#define LABEL_TAG_ON_METHOD_CELL 1
+#define IMAGE_VIEW_TAG_ON_METHOD_CELL 2
+#define TEXTFIELD_TAG_ON_USERNAME_CELL 1
+#define TEXTFIELD_TAG_ON_PASSWORD_CELL 1
+
+#define DUMMY_PASSWD @"##&&**"
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define RADIUS_SAVE_PWD @"radius_save_pwd"
+
+typedef enum {
+ kLoginCellMethodIndex = 0,
+ kLoginCellUsernameIndex,
+ kLoginCellPasswordIndex,
+ kLoginCellPassword2Index,
+ kLoginCellPassword3Index
+} LoginCellIndex;
+
+#define LOGIN_TABLE_SECTIONS 1
+
+@interface LoginViewController () {
+ DropMenuView *_methodMenu;
+
+ BOOL _isMultiMethods;
+ BOOL _isOAuthMethods;
+
+ NSArray *_allMethodNames;
+ NSArray *_allMethodDescs;
+ NSArray *_currentTableCells;
+
+ NSArray *_realPasswords;
+
+ VPNAccount *_account;
+ BOOL _isSMX;
+ BOOL _isSyferLock;
+}
+
+@property (nonatomic, readonly) NSString *currentMethod;
+@property (nonatomic) NSUInteger currentMethodIndex;
+@property (nonatomic, readonly) NSArray *currentTableCells;
+@property (nonatomic, readonly) NSArray *allMethodNames;
+@property (nonatomic, readonly) NSArray *allMethodDescs;
+@property (nonatomic, strong) NSArray *methodActions;
+@property (nonatomic, strong) NSArray *methodRequests;
+@property (nonatomic, strong) AAAManager *model;
+@property (nonatomic, strong) UITextField *usernameTextField;
+@property (nonatomic, strong) UITextField *password1TextField;
+@property (nonatomic, strong) UITextField *password2TextField;
+@property (nonatomic, strong) UITextField *password3TextField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableViewHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+
+@property (strong, nonatomic) UIAlertController *alertController;
+@property (weak, nonatomic) IBOutlet UILabel *methodNameLable;
+@property (nonatomic, strong) Gateway *gateWay;
+@property (assign, nonatomic) auth_type_t currentMethodType;
+
+@end
+
+@implementation LoginViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+ self.model = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.model = [AAAManager sharedInstance];
+ self.gateWay = [[[GatewayModel alloc] init] currentGatewayUpInside];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+
+ [self enableHideKeyboard];
+ [self setLoginButtonAppearance];
+
+ [self getSavedPassword];
+ [self initMethodView];
+ [self tryToAutoLogin];
+
+ //iOS15新特性
+ if (@available(iOS 15.0, *)) {
+
+ self.tableView.sectionHeaderTopPadding = 0;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ NSArray *allDescs = self.allMethodDescs;
+ if (allDescs && allDescs.count > 0) {
+ NSString *methodDesc = [allDescs objectAtIndex:_currentMethodIndex];
+ NSArray *parsedMethodDesc = [self parseMethodDesc:methodDesc];
+ if (parsedMethodDesc.count > 1) {
+ NSString *methodInfo;
+ for (int i = 0; i < parsedMethodDesc.count; i++) {
+ if ([[parsedMethodDesc objectAtIndex:i] containsString:KEY_METHOD_OAUTH]) {
+ methodInfo = [parsedMethodDesc objectAtIndex:i];
+ break;
+ }
+ }
+
+ self.methodActions = [self parseMethodAction:methodInfo];
+ self.methodRequests = [self parseMethodRequest:methodInfo];
+ ANInfo(@"Oauth method action=%@, request =%@", self.methodActions, self.methodRequests);
+ NSString *oAuthurlInfo;
+
+ for (int i = 0; i < self.methodActions.count; i++) {
+ int iAction = [[self.methodActions objectAtIndex:i] intValue] - 1;
+ if (iAction < self.methodRequests.count) {
+ oAuthurlInfo = [self.methodRequests objectAtIndex:iAction];
+ ANInfo(@"Oauth url info=%@", oAuthurlInfo);
+ }
+
+ if ([oAuthurlInfo length] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, get oAuth info failed.",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ return;
+ }
+ if ([oAuthurlInfo containsString:@"http://"] || [oAuthurlInfo containsString:@"https://"]) {
+ OpenURL([NSURL URLWithString:oAuthurlInfo]); // Install app.
+ return;
+ }
+ if ([self saveOAuthCodeLoginInfo:oAuthurlInfo]) {
+ ANInfo(@"launch customer app and save oauth code info.");
+ break;
+ }
+ }
+
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+ return;
+ }
+ }
+
+ NSInteger passwordCount = _isMultiMethods ? _currentTableCells.count - 2 : _currentTableCells.count - 1; // Substract method & username fields.
+ if (passwordCount > 0) {
+ if (![self checkPasswordFieldWithPasswordCount:passwordCount]) {
+ return;
+ }
+ }
+
+ [self login];
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)setLoginButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+- (void)initMethodView {
+ if ([self allAAAMethods].count == 0) {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Incorrect server configuration!",nil)
+ action:^{
+ [weakSelf cancelLogin];
+ }];
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else if ([self allAAAMethods].count > 1) {
+ _isMultiMethods = YES;
+ }else if ([self allAAAMethods].count > 0 && self.model.isOAuthType){ //认证方式
+
+ _isMultiMethods = YES;
+ }
+
+ _currentMethodIndex = 0;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+ if (_currentTableCells.count == 0) {
+ // Only deviceID auth, auto login.
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [weakSelf login];
+ });
+ }
+}
+
+- (NSArray *)allAAAMethods {
+ return [self.model allAAAMehtods];
+}
+
+#pragma mark - Properties
+
+- (NSString *)currentMethod {
+ NSArray *allNames = self.allMethodNames;
+ if (!allNames || allNames.count == 0) {
+ return nil;
+ } else {
+ return [allNames objectAtIndex:_currentMethodIndex];
+ }
+}
+
+-(auth_type_t) currentMethodType{
+
+ NSArray *typeArray = [self allAAAMethods];
+
+ if (!typeArray || typeArray.count == 0) {
+ return -1;
+ } else {
+
+ AAAMethod *method = [typeArray objectAtIndex:_currentMethodIndex];
+ if (method != nil){
+
+ return method.authType;
+ }
+ }
+ return -1;
+}
+
+- (void)setCurrentMethodIndex:(NSUInteger)currentMethodIndex {
+ if (_currentMethodIndex == currentMethodIndex) {
+ return;
+ }
+
+ _currentMethodIndex = currentMethodIndex;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+}
+
+- (NSArray*)allMethodNames {
+ if (_allMethodNames != nil) {
+ return _allMethodNames;
+ }
+
+ NSMutableArray *names = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [names addObject:method.name];
+ }
+
+ _allMethodNames = names;
+
+ return _allMethodNames;
+}
+
+- (NSArray*)allMethodDescs {
+ if (_allMethodDescs != nil) {
+ return _allMethodDescs;
+ }
+
+ NSMutableArray *descs = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [descs addObject:method.methodDescription];
+ }
+
+ _allMethodDescs = descs;
+
+ return _allMethodDescs;
+}
+
+#pragma mark - Parse Method
+
+- (NSArray *)parseMethodDesc:(NSString *)methodDesc {
+ NSMutableArray *methodParsed = [[NSMutableArray alloc] init];
+
+ if ([methodDesc containsString:KEY_METHOD_OAUTH] && [methodDesc containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSCharacterSet *delimiters = [NSCharacterSet characterSetWithCharactersInString:@"()"];
+ return [methodDesc componentsSeparatedByCharactersInSet:delimiters];
+ } else {
+ [methodParsed addObject:methodDesc];
+ }
+
+ return methodParsed;
+}
+
+- (NSArray *)parseMethodAction:(NSString *)methodInfo {
+ NSString *methodAction;
+ NSMutableArray *actionArray = [[NSMutableArray alloc] init];
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodInfo = [methodInfoArray objectAtIndex:i];
+ if ([methodInfo containsString:KEY_METHOD_ACTION]) {
+ NSRange range = [methodInfo rangeOfString:KEY_METHOD_ACTION];
+ methodInfo = [methodInfo substringFromIndex:range.location + range.length];
+ NSArray *methodActionArray = [methodInfo componentsSeparatedByString:@"&"];
+ for(int j = 0; j < methodActionArray.count; j++) {
+ methodInfo = [methodActionArray objectAtIndex:j];
+ if ([methodInfo containsString:KEY_METHOD_MOBILE]) {
+ range = [methodInfo rangeOfString:KEY_METHOD_MOBILE];
+ methodAction = [methodInfo substringFromIndex:range.location + range.length];
+
+ break;
+ }
+ }
+ }
+ }
+
+ if (methodAction.length > 0) {
+ for (int i = 0; i < methodAction.length; i ++) {
+ NSString *temp = [methodAction substringWithRange:NSMakeRange(i, 1)];
+ [actionArray addObject:temp];
+ }
+ }
+ }
+
+ return actionArray;
+}
+
+- (NSArray *)parseMethodRequest:(NSString *)methodInfo {
+ NSMutableArray *methodRequestArray = [[NSMutableArray alloc] init];
+ NSString *methodBuf;
+ NSArray *methodReqArrayBuf;
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodBuf = [methodInfoArray objectAtIndex:i];
+ if ([methodBuf containsString:@"request"]) {
+ methodReqArrayBuf = [methodBuf componentsSeparatedByString:@"&"];
+ break;
+ }
+ }
+
+ for (int i = 0; i < methodReqArrayBuf.count; i ++) {
+ NSString *req = [methodReqArrayBuf objectAtIndex:i];
+ req = [req substringFromIndex:9];
+ [methodRequestArray addObject:req];
+ }
+ }
+
+ return methodRequestArray;
+}
+
+- (BOOL)saveOAuthCodeLoginInfo:(NSString *)oauthInfo {
+ if (![oauthInfo containsString:KEY_METHOD_RELIAO]) {
+ return NO;
+ }
+
+ NSString *reliaoURL = @"reliao://f/vpn?action=login&callback=motionproplus%3a%2f%2fsetcode%3fcode%3d";
+ NSURL *url = [NSURL URLWithString:reliaoURL];
+
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ return NO;
+ }
+
+ oauthInfo = [oauthInfo substringToIndex:[oauthInfo rangeOfString:KEY_METHOD_RELIAO].location];
+ Gateway *gateway = [self currentGateway];
+ NSString *urlString = nil;
+ if ([gateway.port isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@", gateway.host, OAUTH_SESSION_URL, oauthInfo];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@", gateway.host, gateway.port, OAUTH_SESSION_URL, oauthInfo];
+ }
+ ANInfo(@"continue login url=%@", urlString);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameLogin];
+ [userDefaults setValue:urlString forKey:KEY_OAUTH_URL];
+
+ return YES;
+}
+
+#pragma mark - Login Related
+- (void)login {
+ ANInfo(@"------------>Start login...<------------");
+
+ [self.view endEditing:YES];
+
+ [self getCurrentMethod];
+
+ VPNAccount *account = [self inputResult];
+ NSLog(@"vpn account on login: %@",account);
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ self.model.errorCode = 0; // Success
+ [self.model continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (void)cancelLogin {
+ [self showLoginActivity:NO];
+
+ [self.model cancelLoginTapped];
+}
+
+- (VPNAccount *)inputResult {
+ VPNAccount * account = self.model.account;
+
+ account.loginMethod = self.currentMethod;
+ account.userName = self.usernameTextField.text;
+
+ //Get account passwords
+ if ([self.password1TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord = _realPasswords[0];
+ } else {
+ account.passWord = self.password1TextField.text;
+ }
+
+ if ([self.password2TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord2 = _realPasswords[1];
+ } else {
+ account.passWord2 = self.password2TextField.text;
+ }
+
+ if ([self.password3TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord3 = _realPasswords[2];
+ } else {
+ account.passWord3 = self.password3TextField.text;
+ }
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+//Get all cells for the given method
+- (NSArray *)cellsForMethodIndex:(NSUInteger)index {
+ NSArray *methods = [self allAAAMethods];
+ if (methods == nil || methods.count == 0) {
+ ANError(@"No method found for login.");
+ return nil;
+ }
+
+ AAAMethod *method = [methods objectAtIndex:index];
+ if (method == nil) {
+ return nil;
+ }
+
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+
+ for (InputField *field in method.inputFields) {
+ UITableViewCell *cell = [self cellForInputField:field];
+ if (cell == nil) {
+ ANError(@"Unknow inputField type %d", field.type);
+ continue;
+ }
+
+ if (field.type == FieldTypeUsernameText) {
+ // Make sure Username is above password
+ [cells insertObject:cell atIndex:0];
+ } else {
+ [cells addObject:cell];
+ }
+ }
+
+ NSString *infoDesc;
+ if (_isMultiMethods) {
+ //Display the method names
+ UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:methodCellID];
+ [self initMethodMenuWithCell:cell];
+ _methodMenu.titleLabel = (UILabel *)[cell viewWithTag:1];
+ NSArray *pasedMethodDesc = [self parseMethodDesc:method.methodDescription];
+ if (pasedMethodDesc.count > 0) {
+ infoDesc = [pasedMethodDesc objectAtIndex:0];
+ } else {
+ infoDesc = method.methodDescription;
+ }
+ _methodMenu.titleLabel.text = infoDesc;
+ //Method cell shoud be at the top.
+ if (cell != nil) {
+ [cells insertObject:cell atIndex:0];
+ }
+ }
+
+ return cells;
+}
+
+// Create a cell for the inputed field.
+- (UITableViewCell *)cellForInputField:(InputField *)field {
+ UITableViewCell *cell = nil;
+
+ Gateway *gateway = [self currentGateway];
+
+ NSString *username = self.model.account.userName;
+ if (!username || username.length == 0) {
+ username = gateway.username;
+ }
+
+ NSString *passwd;
+
+ switch (field.type) {
+ case FieldTypeUsernameText: {
+ //username field
+ cell = [self.tableView dequeueReusableCellWithIdentifier:usernameCellID];
+ self.usernameTextField = (UITextField *)[cell viewWithTag:TEXTFIELD_TAG_ON_USERNAME_CELL];
+ if (field.inputString) {
+ self.usernameTextField.text = field.inputString;
+ } else {
+ self.usernameTextField.text = username;
+ }
+ break;
+ }
+ case FieldTypePasswordText: {
+ switch (field.passwordIndex) {
+ case INDEX_PASSWORD1: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password1TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password1TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password1TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD2: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password2TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password2TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[1];
+ if (passwd.length > 0) {
+ self.password2TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD3: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password3TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password3TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password3TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ return cell;
+}
+
+- (Gateway *)currentGateway {
+ NSString *url = self.model.account.vsURL;
+ NSString *port = self.model.account.vsPort;
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:url andport:port];
+
+ return gateway;
+}
+
+- (void)getSavedPassword {
+ Gateway *gateway = [self currentGateway];
+ NSString *username = gateway.username;
+
+ _realPasswords = @[@"", @"", @""];
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:gateway.port];
+ }
+
+ if (gateway.isSavePasswordEnabled) {
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:gateway.port];
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+
+ if (!gateway.isFaceOrTouchIDEnabled && !gateway.isGestureEnabled){
+
+ [self deleteMethodName];
+ [self.model.account deleteAllPasswords];
+ }
+ }
+ }
+}
+
+- (void)tryToAutoLogin {
+ Gateway *gateway = [self currentGateway];
+ BOOL showLoginDialog = gateway.isShowLoginDialogEnabled;
+
+ if (gateway.isSavePasswordEnabled) {
+ if (!showLoginDialog && (_currentTableCells.count == 1 || ![_realPasswords isEqual:@[@"", @"", @""]])) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self login];
+ });
+ }
+ }
+}
+
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return LOGIN_TABLE_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ NSInteger totalCells = _currentTableCells.count;
+ [self updateTableViewHeightWithCellsNumber:totalCells];
+ return _currentTableCells.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return _currentTableCells[indexPath.row];
+}
+
+- (void)updateTableViewHeightWithCellsNumber:(NSInteger)cells {
+ self.tableViewHeightConstraint.constant = cells * TABLEVIEW_CELL_HEIGHT + TABLEVIEW_CELL_PADDING;
+}
+
+#pragma mark - SyferLock switch
+- (BOOL)isSyferLockEnabled {
+ Gateway *gateway = [self currentGateway];
+ if (!gateway) {
+ ANInfo(@"Current gateway is nil, no syferlock can be enabled.");
+ return NO;
+ } else {
+ return gateway.isSyferLockEnabled;
+ }
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+
+ if (@available(iOS 15.0, *)){
+
+ return 0.1;
+ }
+
+ return TABLEVIEW_HEADER_HEIGHT;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return TABLEVIEW_FOOTER_HEIGHT;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.section == 0 && indexPath.row == kLoginCellMethodIndex && _isMultiMethods) { // Deal with method drop-down menu.
+ [_methodMenu showMenuOnView:self.view];
+ }
+}
+
+- (BOOL)checkPasswordFieldWithPasswordCount:(NSInteger)count {
+ enum PasswordCount {
+ kPasswordOne = 1,
+ kPasswordTwo = 2,
+ kPasswordThree = 3
+ };
+
+ BOOL result = YES;
+
+ switch (count) {
+ case kPasswordOne:
+ if ([self.password1TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordTwo:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordThree:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""] ||
+ [self.password3TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!result) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, please check username and password",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+
+ return result;
+}
+
+- (void)initMethodMenuWithCell:(UITableViewCell *)cell {
+ if (!_methodMenu) {
+ _methodMenu = [[DropMenuView alloc] initWithOrigin:CGPointMake(0, cell.frame.size.height+TABLEVIEW_HEADER_HEIGHT)];
+ _methodMenu.delegate = self;
+ _methodMenu.dataSource = self;
+ _methodMenu.transformImageView = [cell viewWithTag:IMAGE_VIEW_TAG_ON_METHOD_CELL];
+ _methodMenu.titleLabel = nil;
+ }
+
+ [_methodMenu reloadData];
+}
+
+#pragma mark menuDelegate
+
+- (NSMutableArray *)menu_filterDataArray {
+ NSMutableArray *array = nil;
+ NSArray *descs = self.allMethodDescs;
+ NSString *methodDesc;
+
+ NSInteger index = -1;
+ array = [NSMutableArray arrayWithCapacity:descs.count];
+ for (NSString *desc in descs) {
+ ++index;
+ methodDesc = desc;
+ NSArray *pasedMethodDesc = [self parseMethodDesc:desc];
+ if (pasedMethodDesc.count > 0) {
+ methodDesc = [pasedMethodDesc objectAtIndex:0];
+ }
+
+ FilterTypeModel *model = [[FilterTypeModel alloc] initWithName:methodDesc andId:[NSString stringWithFormat:@"%zi", index]];
+ [array addObject:model];
+ }
+
+ return array;
+}
+
+- (void)menu:(DropMenuView *)menu tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ self.currentMethodIndex = indexPath.row;
+
+ [self.tableView reloadData];
+}
+
+//VPN notifications handler
+- (void)handleVPNNotification:(NSNotification *)notification {
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+ BOOL showAlert = YES;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!_isSMX) {
+ // Save passwords for non-SMX login.
+ [self savePasswordsOfAccount:manager.account];
+ }
+ [self finishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ [self finishLogin:NO];
+ break;
+ }
+ case VPN_CB_DEVID_REG: {
+ if (!_isSMX) {
+ // Save the current account
+ // In SMX, the account has been saved.
+ _account = [manager.account copy];
+ } else {
+ // SMX, clean the saved password, since it is useless after register.
+ manager.account.passWord = nil;
+ }
+
+ [self performSegueWithIdentifier:kSegueToRegister sender:nil];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_DEVID_APPROVE_PENDING:
+ aMessage = NSLocalizedString(@"Your device is registering, please request manager approval",nil);
+ break;
+ case ERR_DEVID_APPROVE_DENY:
+ aMessage = NSLocalizedString(@"Register device deny, not allow register device auto approve",nil);
+ break;
+ case ERR_DEVID_USER_LIMIT:
+ aMessage = NSLocalizedString(@"User for this device has reached his or her limit",nil);
+ break;
+ case ERR_DEVID_DEV_LIMIT:
+ aMessage = NSLocalizedString(@"Device has reached its limit",nil);
+ break;
+ case ERR_WRONG_USER_PASS:
+ if (!_isSyferLock) { // DON'T remove saved password if SyferLock is enabled.
+ [self deleteMethodName];
+ [manager.account deleteAllPasswords];
+ }
+ aMessage = manager.errorInformation;
+ //aMessage = NSLocalizedString(@"Login failed, please check username and password",nil);
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_CERT_NO:
+ aMessage = NSLocalizedString(@"Client certificate not supply", nil);
+ break;
+ case ERR_CERT_INVALID_SIGNTURE:
+ aMessage = NSLocalizedString(@"Client certificate invalid signture", nil);
+ break;
+ case ERR_CERT_UNTRUSTED:
+ aMessage = NSLocalizedString(@"Client certificate untrusted", nil);
+ break;
+ case ERR_CERT_EXPIRED:
+ aMessage = NSLocalizedString(@"Client certificate expired", nil);
+ break;
+ case ERR_CERT_INVALID:
+ aMessage = NSLocalizedString(@"Client certificate invalid", nil);
+ break;
+ case ERR_CERT_REVOKED:
+ aMessage = NSLocalizedString(@"Client certificate revoked", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ // Try to show error message, only valid on viewcontroller still exists.
+ if (![self currentGateway].isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:
+ case VPN_CB_SYFERLOCK_AUTH: {
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+
+ if (!_isSyferLock) {
+ [self removePasswordsOfAccount:manager.account];
+ }
+
+ ANError(@"Error message: %@", manager.errorInformation);
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [self removePasswordsOfAccount:manager.account];
+ } else if (error == ERR_SUCCESS) {
+ //After register, we need to login again. Using the account we have saved.
+ if (!_account) {
+ _account = [AAAManager sharedInstance].account;
+ }
+ [manager continueVPNThreadWithAccount:_account];
+
+ break;
+ }
+ break;
+ }
+ case VPN_CB_SMX: {
+ _isSMX = YES;
+
+ // Save password(s) for multi-step auth.
+ [self savePasswordsOfAccount:manager.account];
+ // Save current account, and use it to login after registering.
+ _account = [manager.account copy];
+
+ // Clean passwords
+ _account.passWord = nil;
+
+ ANDebug(@"message.code VPN_CB_SMX %zi", error);
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info != NULL) {
+ ANDebug(@"smx_info->action: %d", smx_info->action);
+ switch (smx_info->action) {
+ case SMX_ACTION_INPUT_PASS:
+ case SMX_ACTION_INPUT_OLD_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_LOGIN]) {
+ //If the top controller is login controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMX sender:nil];
+ showAlert = NO;
+ }
+ break;
+ case SMX_ACTION_INPUT_NEW_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_NEWPASS]) {
+ //If the top controller is new password controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ break;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMXChangePassword sender:nil];
+ showAlert = NO;
+ }
+ break;
+
+ case SMX_ACTION_PASS_CONFIRM:
+ [self performSegueWithIdentifier:kSegueToSMXConfirmPassword sender:nil];
+ showAlert = NO;
+ break;
+
+ default:
+ break;
+ }
+
+ if (showAlert && smx_info->errmsg[0] != '\0') {
+ NSString *errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:errorMessage];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+ }
+ break;
+ }
+ case VPN_CB_VDI_AUTH: {
+ [self handleVDIAuth];
+ break;
+ }
+ case VPN_CB_SMS: {
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ case VPN_CB_SYFERLOCK_LOGIN: {
+ _isSyferLock = YES;
+ if ([self.navigationController.topViewController isKindOfClass:[SyferLockLoginViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSyferLock sender:nil];
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+// If last login method contains SMX.
+- (BOOL)isSMXAuth {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount *account = _account;
+ if (!account) {
+ account = manager.account;
+ }
+
+ NSString *currentMethod = account.loginMethod;
+
+ NSArray *methods = [self allAAAMethods];
+ for (AAAMethod *method in methods) {
+ if ([method.name isEqualToString:currentMethod]) {
+ return method.isSmx;
+ }
+ }
+
+ return NO;
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if ([self isSMXAuth]) {
+ // Get error message for SMX auth
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info && strlen(smx_info->errmsg) != 0 && [self isValidSMXAction]) {
+ errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ if (errorMessage && ![errorMessage isEqualToString:@"OK"]) {
+ return errorMessage;
+ }
+ }
+ }
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (BOOL)isValidSMXAction {
+ vpn_smx_info_t *smx_info = [AAAManager sharedInstance].smx_info;
+
+ return (smx_info->action >= SMX_ACTION_UNKNOWN && smx_info->action <= SMX_ACTION_PASS_CONFIRM);
+}
+
+- (void)handleVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ self.alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = nil;
+ account.passWord = nil;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = weakSelf.alertController.textFields[0].text; // Username text field
+ NSString *password = weakSelf.alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = username;
+ account.passWord = password;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [self.alertController addAction:confirmAction];
+ [self.alertController addAction:cancelAction];
+
+ [self presentViewController:self.alertController animated:YES completion:nil];
+}
+
+- (void)finishLogin:(BOOL)success {
+ self.alertController = nil;
+
+ __weak typeof(self) weakSelf = self;
+ [self dismissViewControllerAnimated:YES completion:^{
+ [weakSelf.delegate didFinishLogin:success];
+ }];
+}
+
+#pragma mark - Passwords
+- (void)savePasswordsOfAccount:(VPNAccount *)account {
+ Gateway *gateway = [self currentGateway];
+ if (![account.userName isEqualToString:gateway.username]){
+
+ gateway.username = account.userName;
+ [[[GatewayManager alloc] init] updateGateway:gateway];
+ }
+
+ if (account.userName){
+
+ [self saveMethodName];
+ [self savePassWord:account];
+ return;
+ }
+
+ if (gateway.username) { // Only remember password when username is configured.
+
+ [self savePassWord:account];
+ } else {
+ ANDebug(@"Password will be deleted, because the login user is different from the one in settings.");
+
+ [self deleteMethodName];
+ [account deleteAllPasswords];
+ }
+}
+
+-(void) savePassWord: (VPNAccount *) account
+{
+ NSMutableArray *passwords = [[NSMutableArray alloc] init];
+ if (account.passWord) {
+ [passwords addObject:[account.passWord copy]];
+ }
+
+ Gateway *gateway = [self currentGateway];
+
+ if (![self isRadiusSavePass:account.loginMethod]){
+
+ gateway.isRadiusPWD = NO;
+ if (account.passWord2) {
+ [passwords addObject:[account.passWord2 copy]];
+ }
+ if (account.passWord3) {
+ [passwords addObject:[account.passWord3 copy]];
+ }
+ }else{
+
+ gateway.isRadiusPWD = YES;
+ }
+
+ [PasswordManager savePasswords:passwords forHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+-(BOOL) isRadiusSavePass: (NSString *) methodName
+{
+ if (self.allMethodDescs.count < 1 || ISNULLSTR(methodName)){
+
+ return NO;
+ }
+
+ NSInteger acount = [self.allMethodNames indexOfObject:methodName];
+
+ if (acount < 0){
+
+ return NO;
+ }
+
+ NSString *methodDesc = [_allMethodDescs objectAtIndex:acount];
+ if ([methodDesc rangeOfString:RADIUS_SAVE_PWD].location != NSNotFound){
+
+ ANInfo(@"LoginView-isRadiusSavePass- did not save pwd");
+ return YES;
+ }
+
+ return NO;
+}
+
+-(void) saveMethodName
+{
+ NSString *methodName = self.currentMethod ?: (_methodMenu.titleLabel.text ?: @"");
+ NSString *userName = _usernameTextField.text ?: @"";
+ if ([methodName isEqualToString:@""]){
+
+ methodName = @"ldb";
+ }
+
+ NSString *methodType = [Singleton sharedSingleton].isSupportAuth ? @"0" : @"1";
+ NSDictionary *verifyDic = @{@"methodName" : methodName, @"userName" : userName, @"methodType" : methodType};
+ [Singleton setCurrentGatewayMethod:verifyDic andKey:self.gateWay];
+}
+
+-(void) getCurrentMethod
+{
+ auth_type_t type = self.currentMethodType;
+ if (type == AUTH_LOCALDB || type == AUTH_LDAP || type == AUTH_RADIUS || type == AUTH_RADIUS_ACCOUNT ||
+ type == AUTH_DEVID || type == AUTH_HTTP || type == AUTH_CERTIFICATE){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ if (type == AUTH_CERTIFICATE){
+
+ _usernameTextField.text = @"";
+ }
+}
+
+-(void) deleteMethodName
+{
+ [Singleton setCurrentGatewayMethod:@{} andKey:self.gateWay];
+}
+
+- (void)removePasswordsOfAccount:(VPNAccount *)account {
+ [PasswordManager removePasswordsOfHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.usernameTextField) {
+ [self.usernameTextField resignFirstResponder];
+ if (_currentTableCells.count > 1) {
+ [self.password1TextField becomeFirstResponder];
+ }
+ }
+
+ return YES;
+}
+
+#pragma mark - ANViewControllerSwitchProtocol
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option {
+ if (sender) {
+ self.delegate = sender;
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.InfosecEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.InfosecEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.InfosecEnterprise (working copy)
@@ -0,0 +1,1346 @@
+//
+// LoginViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/19.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "ArrayVPNWrapper.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "DropMenuView.h"
+#import "ANPopupDialog.h"
+#import "FilterTypeModel.h"
+#import "UIDevice+Hardware.h"
+#import "SMSViewController.h"
+#import "SyferLockLoginViewController.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "LoginViewController.h"
+#import "GatewayModel.h"
+#import "Singleton.h"
+
+static NSString * const methodCellID = @"LoginMethodCell";
+static NSString * const usernameCellID = @"LoginUsernameCell";
+static NSString * const passwordCellID = @"LoginPasswordCell";
+
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+static NSString * const kSegueToRegister = @"LoginToRegister";
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToSMX = @"LoginToSMX";
+static NSString * const kSegueToSMXChangePassword = @"LoginToSMXChangePassword";
+static NSString * const kSegueToSMXConfirmPassword = @"LoginToSMXConfirmPassword";
+static NSString * const kSegueToSyferLock = @"LoginToSyferLock";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameLogin = @"group.net.infosec.groupenterprise";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameLogin = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+#define VIEW_CONTROLLER_ID_SMX_LOGIN @"SMXLoginViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_NEWPASS @"SMXNewPasswordViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_CONFIRM @"SMXConfirmPasswordViewControllerID"
+
+#define TABLEVIEW_HEADER_HEIGHT 15
+#define TABLEVIEW_FOOTER_HEIGHT CGFLOAT_MIN
+#define TABLEVIEW_CELL_HEIGHT 60
+#define TABLEVIEW_CELL_PADDING 10
+
+#define LABEL_TAG_ON_METHOD_CELL 1
+#define IMAGE_VIEW_TAG_ON_METHOD_CELL 2
+#define TEXTFIELD_TAG_ON_USERNAME_CELL 1
+#define TEXTFIELD_TAG_ON_PASSWORD_CELL 1
+
+#define DUMMY_PASSWD @"##&&**"
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define RADIUS_SAVE_PWD @"radius_save_pwd"
+
+typedef enum {
+ kLoginCellMethodIndex = 0,
+ kLoginCellUsernameIndex,
+ kLoginCellPasswordIndex,
+ kLoginCellPassword2Index,
+ kLoginCellPassword3Index
+} LoginCellIndex;
+
+#define LOGIN_TABLE_SECTIONS 1
+
+@interface LoginViewController () {
+ DropMenuView *_methodMenu;
+
+ BOOL _isMultiMethods;
+ BOOL _isOAuthMethods;
+
+ NSArray *_allMethodNames;
+ NSArray *_allMethodDescs;
+ NSArray *_currentTableCells;
+
+ NSArray *_realPasswords;
+
+ VPNAccount *_account;
+ BOOL _isSMX;
+ BOOL _isSyferLock;
+}
+
+@property (nonatomic, readonly) NSString *currentMethod;
+@property (nonatomic) NSUInteger currentMethodIndex;
+@property (nonatomic, readonly) NSArray *currentTableCells;
+@property (nonatomic, readonly) NSArray *allMethodNames;
+@property (nonatomic, readonly) NSArray *allMethodDescs;
+@property (nonatomic, strong) NSArray *methodActions;
+@property (nonatomic, strong) NSArray *methodRequests;
+@property (nonatomic, strong) AAAManager *model;
+@property (nonatomic, strong) UITextField *usernameTextField;
+@property (nonatomic, strong) UITextField *password1TextField;
+@property (nonatomic, strong) UITextField *password2TextField;
+@property (nonatomic, strong) UITextField *password3TextField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableViewHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+
+@property (strong, nonatomic) UIAlertController *alertController;
+@property (weak, nonatomic) IBOutlet UILabel *methodNameLable;
+@property (nonatomic, strong) Gateway *gateWay;
+@property (assign, nonatomic) auth_type_t currentMethodType;
+
+@end
+
+@implementation LoginViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+ self.model = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.model = [AAAManager sharedInstance];
+ self.gateWay = [[[GatewayModel alloc] init] currentGatewayUpInside];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+
+ [self enableHideKeyboard];
+ [self setLoginButtonAppearance];
+
+ [self getSavedPassword];
+ [self initMethodView];
+ [self tryToAutoLogin];
+
+ //iOS15新特性
+ if (@available(iOS 15.0, *)) {
+
+ self.tableView.sectionHeaderTopPadding = 0;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ NSArray *allDescs = self.allMethodDescs;
+ if (allDescs && allDescs.count > 0) {
+ NSString *methodDesc = [allDescs objectAtIndex:_currentMethodIndex];
+ NSArray *parsedMethodDesc = [self parseMethodDesc:methodDesc];
+ if (parsedMethodDesc.count > 1) {
+ NSString *methodInfo;
+ for (int i = 0; i < parsedMethodDesc.count; i++) {
+ if ([[parsedMethodDesc objectAtIndex:i] containsString:KEY_METHOD_OAUTH]) {
+ methodInfo = [parsedMethodDesc objectAtIndex:i];
+ break;
+ }
+ }
+
+ self.methodActions = [self parseMethodAction:methodInfo];
+ self.methodRequests = [self parseMethodRequest:methodInfo];
+ ANInfo(@"Oauth method action=%@, request =%@", self.methodActions, self.methodRequests);
+ NSString *oAuthurlInfo;
+
+ for (int i = 0; i < self.methodActions.count; i++) {
+ int iAction = [[self.methodActions objectAtIndex:i] intValue] - 1;
+ if (iAction < self.methodRequests.count) {
+ oAuthurlInfo = [self.methodRequests objectAtIndex:iAction];
+ ANInfo(@"Oauth url info=%@", oAuthurlInfo);
+ }
+
+ if ([oAuthurlInfo length] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, get oAuth info failed.",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ return;
+ }
+ if ([oAuthurlInfo containsString:@"http://"] || [oAuthurlInfo containsString:@"https://"]) {
+ OpenURL([NSURL URLWithString:oAuthurlInfo]); // Install app.
+ return;
+ }
+ if ([self saveOAuthCodeLoginInfo:oAuthurlInfo]) {
+ ANInfo(@"launch customer app and save oauth code info.");
+ break;
+ }
+ }
+
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+ return;
+ }
+ }
+
+ NSInteger passwordCount = _isMultiMethods ? _currentTableCells.count - 2 : _currentTableCells.count - 1; // Substract method & username fields.
+ if (passwordCount > 0) {
+ if (![self checkPasswordFieldWithPasswordCount:passwordCount]) {
+ return;
+ }
+ }
+
+ [self login];
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)setLoginButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+- (void)initMethodView {
+ if ([self allAAAMethods].count == 0) {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Incorrect server configuration!",nil)
+ action:^{
+ [weakSelf cancelLogin];
+ }];
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else if ([self allAAAMethods].count > 1) {
+ _isMultiMethods = YES;
+ }else if ([self allAAAMethods].count > 0 && self.model.isOAuthType){ //认证方式
+
+ _isMultiMethods = YES;
+ }
+
+ _currentMethodIndex = 0;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+ if (_currentTableCells.count == 0) {
+ // Only deviceID auth, auto login.
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [weakSelf login];
+ });
+ }
+}
+
+- (NSArray *)allAAAMethods {
+ return [self.model allAAAMehtods];
+}
+
+#pragma mark - Properties
+
+- (NSString *)currentMethod {
+ NSArray *allNames = self.allMethodNames;
+ if (!allNames || allNames.count == 0) {
+ return nil;
+ } else {
+ return [allNames objectAtIndex:_currentMethodIndex];
+ }
+}
+
+-(auth_type_t) currentMethodType{
+
+ NSArray *typeArray = [self allAAAMethods];
+
+ if (!typeArray || typeArray.count == 0) {
+ return -1;
+ } else {
+
+ AAAMethod *method = [typeArray objectAtIndex:_currentMethodIndex];
+ if (method != nil){
+
+ return method.authType;
+ }
+ }
+ return -1;
+}
+
+- (void)setCurrentMethodIndex:(NSUInteger)currentMethodIndex {
+ if (_currentMethodIndex == currentMethodIndex) {
+ return;
+ }
+
+ _currentMethodIndex = currentMethodIndex;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+}
+
+- (NSArray*)allMethodNames {
+ if (_allMethodNames != nil) {
+ return _allMethodNames;
+ }
+
+ NSMutableArray *names = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [names addObject:method.name];
+ }
+
+ _allMethodNames = names;
+
+ return _allMethodNames;
+}
+
+- (NSArray*)allMethodDescs {
+ if (_allMethodDescs != nil) {
+ return _allMethodDescs;
+ }
+
+ NSMutableArray *descs = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [descs addObject:method.methodDescription];
+ }
+
+ _allMethodDescs = descs;
+
+ return _allMethodDescs;
+}
+
+#pragma mark - Parse Method
+
+- (NSArray *)parseMethodDesc:(NSString *)methodDesc {
+ NSMutableArray *methodParsed = [[NSMutableArray alloc] init];
+
+ if ([methodDesc containsString:KEY_METHOD_OAUTH] && [methodDesc containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSCharacterSet *delimiters = [NSCharacterSet characterSetWithCharactersInString:@"()"];
+ return [methodDesc componentsSeparatedByCharactersInSet:delimiters];
+ } else {
+ [methodParsed addObject:methodDesc];
+ }
+
+ return methodParsed;
+}
+
+- (NSArray *)parseMethodAction:(NSString *)methodInfo {
+ NSString *methodAction;
+ NSMutableArray *actionArray = [[NSMutableArray alloc] init];
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodInfo = [methodInfoArray objectAtIndex:i];
+ if ([methodInfo containsString:KEY_METHOD_ACTION]) {
+ NSRange range = [methodInfo rangeOfString:KEY_METHOD_ACTION];
+ methodInfo = [methodInfo substringFromIndex:range.location + range.length];
+ NSArray *methodActionArray = [methodInfo componentsSeparatedByString:@"&"];
+ for(int j = 0; j < methodActionArray.count; j++) {
+ methodInfo = [methodActionArray objectAtIndex:j];
+ if ([methodInfo containsString:KEY_METHOD_MOBILE]) {
+ range = [methodInfo rangeOfString:KEY_METHOD_MOBILE];
+ methodAction = [methodInfo substringFromIndex:range.location + range.length];
+
+ break;
+ }
+ }
+ }
+ }
+
+ if (methodAction.length > 0) {
+ for (int i = 0; i < methodAction.length; i ++) {
+ NSString *temp = [methodAction substringWithRange:NSMakeRange(i, 1)];
+ [actionArray addObject:temp];
+ }
+ }
+ }
+
+ return actionArray;
+}
+
+- (NSArray *)parseMethodRequest:(NSString *)methodInfo {
+ NSMutableArray *methodRequestArray = [[NSMutableArray alloc] init];
+ NSString *methodBuf;
+ NSArray *methodReqArrayBuf;
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodBuf = [methodInfoArray objectAtIndex:i];
+ if ([methodBuf containsString:@"request"]) {
+ methodReqArrayBuf = [methodBuf componentsSeparatedByString:@"&"];
+ break;
+ }
+ }
+
+ for (int i = 0; i < methodReqArrayBuf.count; i ++) {
+ NSString *req = [methodReqArrayBuf objectAtIndex:i];
+ req = [req substringFromIndex:9];
+ [methodRequestArray addObject:req];
+ }
+ }
+
+ return methodRequestArray;
+}
+
+- (BOOL)saveOAuthCodeLoginInfo:(NSString *)oauthInfo {
+ if (![oauthInfo containsString:KEY_METHOD_RELIAO]) {
+ return NO;
+ }
+
+ NSString *reliaoURL = @"reliao://f/vpn?action=login&callback=motionproplus%3a%2f%2fsetcode%3fcode%3d";
+ NSURL *url = [NSURL URLWithString:reliaoURL];
+
+ if (!OpenURL(url)) {
+ return NO;
+ }
+
+ oauthInfo = [oauthInfo substringToIndex:[oauthInfo rangeOfString:KEY_METHOD_RELIAO].location];
+ Gateway *gateway = [self currentGateway];
+ NSString *urlString = nil;
+ if ([gateway.port isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@", gateway.host, OAUTH_SESSION_URL, oauthInfo];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@", gateway.host, gateway.port, OAUTH_SESSION_URL, oauthInfo];
+ }
+ ANInfo(@"continue login url=%@", urlString);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameLogin];
+ [userDefaults setValue:urlString forKey:KEY_OAUTH_URL];
+
+ return YES;
+}
+
+#pragma mark - Login Related
+- (void)login {
+ ANInfo(@"------------>Start login...<------------");
+
+ [self.view endEditing:YES];
+
+ [self getCurrentMethod];
+
+ VPNAccount *account = [self inputResult];
+ NSLog(@"vpn account on login: %@",account);
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ self.model.errorCode = 0; // Success
+ [self.model continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (void)cancelLogin {
+ [self showLoginActivity:NO];
+
+ [self.model cancelLoginTapped];
+}
+
+- (VPNAccount *)inputResult {
+ VPNAccount * account = self.model.account;
+
+ account.loginMethod = self.currentMethod;
+ account.userName = self.usernameTextField.text;
+
+ //Get account passwords
+ if ([self.password1TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord = _realPasswords[0];
+ } else {
+ account.passWord = self.password1TextField.text;
+ }
+
+ if ([self.password2TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord2 = _realPasswords[1];
+ } else {
+ account.passWord2 = self.password2TextField.text;
+ }
+
+ if ([self.password3TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord3 = _realPasswords[2];
+ } else {
+ account.passWord3 = self.password3TextField.text;
+ }
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+//Get all cells for the given method
+- (NSArray *)cellsForMethodIndex:(NSUInteger)index {
+ NSArray *methods = [self allAAAMethods];
+ if (methods == nil || methods.count == 0) {
+ ANError(@"No method found for login.");
+ return nil;
+ }
+
+ AAAMethod *method = [methods objectAtIndex:index];
+ if (method == nil) {
+ return nil;
+ }
+
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+
+ for (InputField *field in method.inputFields) {
+ UITableViewCell *cell = [self cellForInputField:field];
+ if (cell == nil) {
+ ANError(@"Unknow inputField type %d", field.type);
+ continue;
+ }
+
+ if (field.type == FieldTypeUsernameText) {
+ // Make sure Username is above password
+ [cells insertObject:cell atIndex:0];
+ } else {
+ [cells addObject:cell];
+ }
+ }
+
+ NSString *infoDesc;
+ if (_isMultiMethods) {
+ //Display the method names
+ UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:methodCellID];
+ [self initMethodMenuWithCell:cell];
+ _methodMenu.titleLabel = (UILabel *)[cell viewWithTag:1];
+ NSArray *pasedMethodDesc = [self parseMethodDesc:method.methodDescription];
+ if (pasedMethodDesc.count > 0) {
+ infoDesc = [pasedMethodDesc objectAtIndex:0];
+ } else {
+ infoDesc = method.methodDescription;
+ }
+ _methodMenu.titleLabel.text = infoDesc;
+ //Method cell shoud be at the top.
+ if (cell != nil) {
+ [cells insertObject:cell atIndex:0];
+ }
+ }
+
+ return cells;
+}
+
+// Create a cell for the inputed field.
+- (UITableViewCell *)cellForInputField:(InputField *)field {
+ UITableViewCell *cell = nil;
+
+ Gateway *gateway = [self currentGateway];
+
+ NSString *username = self.model.account.userName;
+ if (!username || username.length == 0) {
+ username = gateway.username;
+ }
+
+ NSString *passwd;
+
+ switch (field.type) {
+ case FieldTypeUsernameText: {
+ //username field
+ cell = [self.tableView dequeueReusableCellWithIdentifier:usernameCellID];
+ self.usernameTextField = (UITextField *)[cell viewWithTag:TEXTFIELD_TAG_ON_USERNAME_CELL];
+ if (field.inputString) {
+ self.usernameTextField.text = field.inputString;
+ } else {
+ self.usernameTextField.text = username;
+ }
+ break;
+ }
+ case FieldTypePasswordText: {
+ switch (field.passwordIndex) {
+ case INDEX_PASSWORD1: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password1TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password1TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password1TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD2: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password2TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password2TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[1];
+ if (passwd.length > 0) {
+ self.password2TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD3: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password3TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password3TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password3TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ return cell;
+}
+
+- (Gateway *)currentGateway {
+ NSString *url = self.model.account.vsURL;
+ NSString *port = self.model.account.vsPort;
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:url andport:port];
+
+ return gateway;
+}
+
+- (void)getSavedPassword {
+ Gateway *gateway = [self currentGateway];
+ NSString *username = gateway.username;
+
+ _realPasswords = @[@"", @"", @""];
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:gateway.port];
+ }
+
+ if (gateway.isSavePasswordEnabled) {
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:gateway.port];
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+
+ if (!gateway.isFaceOrTouchIDEnabled && !gateway.isGestureEnabled){
+
+ [self deleteMethodName];
+ [self.model.account deleteAllPasswords];
+ }
+ }
+ }
+}
+
+- (void)tryToAutoLogin {
+ Gateway *gateway = [self currentGateway];
+ BOOL showLoginDialog = gateway.isShowLoginDialogEnabled;
+
+ if (gateway.isSavePasswordEnabled) {
+ if (!showLoginDialog && (_currentTableCells.count == 1 || ![_realPasswords isEqual:@[@"", @"", @""]])) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self login];
+ });
+ }
+ }
+}
+
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return LOGIN_TABLE_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ NSInteger totalCells = _currentTableCells.count;
+ [self updateTableViewHeightWithCellsNumber:totalCells];
+ return _currentTableCells.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return _currentTableCells[indexPath.row];
+}
+
+- (void)updateTableViewHeightWithCellsNumber:(NSInteger)cells {
+ self.tableViewHeightConstraint.constant = cells * TABLEVIEW_CELL_HEIGHT + TABLEVIEW_CELL_PADDING;
+}
+
+#pragma mark - SyferLock switch
+- (BOOL)isSyferLockEnabled {
+ Gateway *gateway = [self currentGateway];
+ if (!gateway) {
+ ANInfo(@"Current gateway is nil, no syferlock can be enabled.");
+ return NO;
+ } else {
+ return gateway.isSyferLockEnabled;
+ }
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+
+ if (@available(iOS 15.0, *)){
+
+ return 0.1;
+ }
+
+ return TABLEVIEW_HEADER_HEIGHT;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return TABLEVIEW_FOOTER_HEIGHT;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.section == 0 && indexPath.row == kLoginCellMethodIndex && _isMultiMethods) { // Deal with method drop-down menu.
+ [_methodMenu showMenuOnView:self.view];
+ }
+}
+
+- (BOOL)checkPasswordFieldWithPasswordCount:(NSInteger)count {
+ enum PasswordCount {
+ kPasswordOne = 1,
+ kPasswordTwo = 2,
+ kPasswordThree = 3
+ };
+
+ BOOL result = YES;
+
+ switch (count) {
+ case kPasswordOne:
+ if ([self.password1TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordTwo:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordThree:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""] ||
+ [self.password3TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!result) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, please check username and password",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+
+ return result;
+}
+
+- (void)initMethodMenuWithCell:(UITableViewCell *)cell {
+ if (!_methodMenu) {
+ _methodMenu = [[DropMenuView alloc] initWithOrigin:CGPointMake(0, cell.frame.size.height+TABLEVIEW_HEADER_HEIGHT)];
+ _methodMenu.delegate = self;
+ _methodMenu.dataSource = self;
+ _methodMenu.transformImageView = [cell viewWithTag:IMAGE_VIEW_TAG_ON_METHOD_CELL];
+ _methodMenu.titleLabel = nil;
+ }
+
+ [_methodMenu reloadData];
+}
+
+#pragma mark menuDelegate
+
+- (NSMutableArray *)menu_filterDataArray {
+ NSMutableArray *array = nil;
+ NSArray *descs = self.allMethodDescs;
+ NSString *methodDesc;
+
+ NSInteger index = -1;
+ array = [NSMutableArray arrayWithCapacity:descs.count];
+ for (NSString *desc in descs) {
+ ++index;
+ methodDesc = desc;
+ NSArray *pasedMethodDesc = [self parseMethodDesc:desc];
+ if (pasedMethodDesc.count > 0) {
+ methodDesc = [pasedMethodDesc objectAtIndex:0];
+ }
+
+ FilterTypeModel *model = [[FilterTypeModel alloc] initWithName:methodDesc andId:[NSString stringWithFormat:@"%zi", index]];
+ [array addObject:model];
+ }
+
+ return array;
+}
+
+- (void)menu:(DropMenuView *)menu tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ self.currentMethodIndex = indexPath.row;
+
+ [self.tableView reloadData];
+}
+
+//VPN notifications handler
+- (void)handleVPNNotification:(NSNotification *)notification {
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+ BOOL showAlert = YES;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!_isSMX) {
+ // Save passwords for non-SMX login.
+ [self savePasswordsOfAccount:manager.account];
+ }
+ [self finishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ [self finishLogin:NO];
+ break;
+ }
+ case VPN_CB_DEVID_REG: {
+ if (!_isSMX) {
+ // Save the current account
+ // In SMX, the account has been saved.
+ _account = [manager.account copy];
+ } else {
+ // SMX, clean the saved password, since it is useless after register.
+ manager.account.passWord = nil;
+ }
+
+ [self performSegueWithIdentifier:kSegueToRegister sender:nil];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_DEVID_APPROVE_PENDING:
+ aMessage = NSLocalizedString(@"Your device is registering, please request manager approval",nil);
+ break;
+ case ERR_DEVID_APPROVE_DENY:
+ aMessage = NSLocalizedString(@"Register device deny, not allow register device auto approve",nil);
+ break;
+ case ERR_DEVID_USER_LIMIT:
+ aMessage = NSLocalizedString(@"User for this device has reached his or her limit",nil);
+ break;
+ case ERR_DEVID_DEV_LIMIT:
+ aMessage = NSLocalizedString(@"Device has reached its limit",nil);
+ break;
+ case ERR_WRONG_USER_PASS:
+ if (!_isSyferLock) { // DON'T remove saved password if SyferLock is enabled.
+ [self deleteMethodName];
+ [manager.account deleteAllPasswords];
+ }
+ aMessage = manager.errorInformation;
+ //aMessage = NSLocalizedString(@"Login failed, please check username and password",nil);
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_CERT_NO:
+ aMessage = NSLocalizedString(@"Client certificate not supply", nil);
+ break;
+ case ERR_CERT_INVALID_SIGNTURE:
+ aMessage = NSLocalizedString(@"Client certificate invalid signture", nil);
+ break;
+ case ERR_CERT_UNTRUSTED:
+ aMessage = NSLocalizedString(@"Client certificate untrusted", nil);
+ break;
+ case ERR_CERT_EXPIRED:
+ aMessage = NSLocalizedString(@"Client certificate expired", nil);
+ break;
+ case ERR_CERT_INVALID:
+ aMessage = NSLocalizedString(@"Client certificate invalid", nil);
+ break;
+ case ERR_CERT_REVOKED:
+ aMessage = NSLocalizedString(@"Client certificate revoked", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ // Try to show error message, only valid on viewcontroller still exists.
+ if (![self currentGateway].isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:
+ case VPN_CB_SYFERLOCK_AUTH: {
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+
+ if (!_isSyferLock) {
+ [self removePasswordsOfAccount:manager.account];
+ }
+
+ ANError(@"Error message: %@", manager.errorInformation);
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [self removePasswordsOfAccount:manager.account];
+ } else if (error == ERR_SUCCESS) {
+ //After register, we need to login again. Using the account we have saved.
+ if (!_account) {
+ _account = [AAAManager sharedInstance].account;
+ }
+ [manager continueVPNThreadWithAccount:_account];
+
+ break;
+ }
+ break;
+ }
+ case VPN_CB_SMX: {
+ _isSMX = YES;
+
+ // Save password(s) for multi-step auth.
+ [self savePasswordsOfAccount:manager.account];
+ // Save current account, and use it to login after registering.
+ _account = [manager.account copy];
+
+ // Clean passwords
+ _account.passWord = nil;
+
+ ANDebug(@"message.code VPN_CB_SMX %zi", error);
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info != NULL) {
+ ANDebug(@"smx_info->action: %d", smx_info->action);
+ switch (smx_info->action) {
+ case SMX_ACTION_INPUT_PASS:
+ case SMX_ACTION_INPUT_OLD_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_LOGIN]) {
+ //If the top controller is login controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMX sender:nil];
+ showAlert = NO;
+ }
+ break;
+ case SMX_ACTION_INPUT_NEW_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_NEWPASS]) {
+ //If the top controller is new password controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ break;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMXChangePassword sender:nil];
+ showAlert = NO;
+ }
+ break;
+
+ case SMX_ACTION_PASS_CONFIRM:
+ [self performSegueWithIdentifier:kSegueToSMXConfirmPassword sender:nil];
+ showAlert = NO;
+ break;
+
+ default:
+ break;
+ }
+
+ if (showAlert && smx_info->errmsg[0] != '\0') {
+ NSString *errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:errorMessage];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+ }
+ break;
+ }
+ case VPN_CB_VDI_AUTH: {
+ [self handleVDIAuth];
+ break;
+ }
+ case VPN_CB_SMS: {
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ case VPN_CB_SYFERLOCK_LOGIN: {
+ _isSyferLock = YES;
+ if ([self.navigationController.topViewController isKindOfClass:[SyferLockLoginViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSyferLock sender:nil];
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+// If last login method contains SMX.
+- (BOOL)isSMXAuth {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount *account = _account;
+ if (!account) {
+ account = manager.account;
+ }
+
+ NSString *currentMethod = account.loginMethod;
+
+ NSArray *methods = [self allAAAMethods];
+ for (AAAMethod *method in methods) {
+ if ([method.name isEqualToString:currentMethod]) {
+ return method.isSmx;
+ }
+ }
+
+ return NO;
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if ([self isSMXAuth]) {
+ // Get error message for SMX auth
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info && strlen(smx_info->errmsg) != 0 && [self isValidSMXAction]) {
+ errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ if (errorMessage && ![errorMessage isEqualToString:@"OK"]) {
+ return errorMessage;
+ }
+ }
+ }
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (BOOL)isValidSMXAction {
+ vpn_smx_info_t *smx_info = [AAAManager sharedInstance].smx_info;
+
+ return (smx_info->action >= SMX_ACTION_UNKNOWN && smx_info->action <= SMX_ACTION_PASS_CONFIRM);
+}
+
+- (void)handleVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ self.alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = nil;
+ account.passWord = nil;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = weakSelf.alertController.textFields[0].text; // Username text field
+ NSString *password = weakSelf.alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = username;
+ account.passWord = password;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [self.alertController addAction:confirmAction];
+ [self.alertController addAction:cancelAction];
+
+ [self presentViewController:self.alertController animated:YES completion:nil];
+}
+
+- (void)finishLogin:(BOOL)success {
+ self.alertController = nil;
+
+ __weak typeof(self) weakSelf = self;
+ [self dismissViewControllerAnimated:YES completion:^{
+ [weakSelf.delegate didFinishLogin:success];
+ }];
+}
+
+#pragma mark - Passwords
+- (void)savePasswordsOfAccount:(VPNAccount *)account {
+ Gateway *gateway = [self currentGateway];
+ if (![account.userName isEqualToString:gateway.username]){
+
+ gateway.username = account.userName;
+ [[[GatewayManager alloc] init] updateGateway:gateway];
+ }
+
+ if (account.userName){
+
+ [self saveMethodName];
+ [self savePassWord:account];
+ return;
+ }
+
+ if (gateway.username) { // Only remember password when username is configured.
+
+ [self savePassWord:account];
+ } else {
+ ANDebug(@"Password will be deleted, because the login user is different from the one in settings.");
+
+ [self deleteMethodName];
+ [account deleteAllPasswords];
+ }
+}
+
+-(void) savePassWord: (VPNAccount *) account
+{
+ NSMutableArray *passwords = [[NSMutableArray alloc] init];
+ if (account.passWord) {
+ [passwords addObject:[account.passWord copy]];
+ }
+
+ Gateway *gateway = [self currentGateway];
+
+ if (![self isRadiusSavePass:account.loginMethod]){
+
+ gateway.isRadiusPWD = NO;
+ if (account.passWord2) {
+ [passwords addObject:[account.passWord2 copy]];
+ }
+ if (account.passWord3) {
+ [passwords addObject:[account.passWord3 copy]];
+ }
+ }else{
+
+ gateway.isRadiusPWD = YES;
+ }
+
+ [PasswordManager savePasswords:passwords forHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+-(BOOL) isRadiusSavePass: (NSString *) methodName
+{
+ if (self.allMethodDescs.count < 1){
+
+ return NO;
+ }
+
+ NSInteger acount = [self.allMethodNames indexOfObject:methodName];
+
+ if (acount < 0){
+
+ return NO;
+ }
+
+ NSString *methodDesc = [_allMethodDescs objectAtIndex:acount];
+ if ([methodDesc rangeOfString:RADIUS_SAVE_PWD].location != NSNotFound){
+
+ ANInfo(@"LoginView-isRadiusSavePass- did not save pwd");
+ return YES;
+ }
+
+ return NO;
+}
+
+-(void) saveMethodName
+{
+ NSString *methodName = self.currentMethod ?: (_methodMenu.titleLabel.text ?: @"");
+ NSString *userName = _usernameTextField.text ?: @"";
+ if ([methodName isEqualToString:@""]){
+
+ methodName = @"ldb";
+ }
+
+ NSString *methodType = [Singleton sharedSingleton].isSupportAuth ? @"0" : @"1";
+ NSDictionary *verifyDic = @{@"methodName" : methodName, @"userName" : userName, @"methodType" : methodType};
+ [Singleton setCurrentGatewayMethod:verifyDic andKey:self.gateWay];
+}
+
+-(void) getCurrentMethod
+{
+ auth_type_t type = self.currentMethodType;
+ if (type == AUTH_LOCALDB || type == AUTH_LDAP || type == AUTH_RADIUS || type == AUTH_RADIUS_ACCOUNT ||
+ type == AUTH_DEVID || type == AUTH_HTTP || type == AUTH_CERTIFICATE){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ if (type == AUTH_CERTIFICATE){
+
+ _usernameTextField.text = @"";
+ }
+}
+
+-(void) deleteMethodName
+{
+ [Singleton setCurrentGatewayMethod:@{} andKey:self.gateWay];
+}
+
+- (void)removePasswordsOfAccount:(VPNAccount *)account {
+ [PasswordManager removePasswordsOfHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.usernameTextField) {
+ [self.usernameTextField resignFirstResponder];
+ if (_currentTableCells.count > 1) {
+ [self.password1TextField becomeFirstResponder];
+ }
+ }
+
+ return YES;
+}
+
+#pragma mark - ANViewControllerSwitchProtocol
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option {
+ if (sender) {
+ self.delegate = sender;
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.InfosecStore
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.InfosecStore (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.InfosecStore (working copy)
@@ -0,0 +1,1346 @@
+//
+// LoginViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/19.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "ArrayVPNWrapper.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "DropMenuView.h"
+#import "ANPopupDialog.h"
+#import "FilterTypeModel.h"
+#import "UIDevice+Hardware.h"
+#import "SMSViewController.h"
+#import "SyferLockLoginViewController.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "LoginViewController.h"
+#import "GatewayModel.h"
+#import "Singleton.h"
+
+static NSString * const methodCellID = @"LoginMethodCell";
+static NSString * const usernameCellID = @"LoginUsernameCell";
+static NSString * const passwordCellID = @"LoginPasswordCell";
+
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+static NSString * const kSegueToRegister = @"LoginToRegister";
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToSMX = @"LoginToSMX";
+static NSString * const kSegueToSMXChangePassword = @"LoginToSMXChangePassword";
+static NSString * const kSegueToSMXConfirmPassword = @"LoginToSMXConfirmPassword";
+static NSString * const kSegueToSyferLock = @"LoginToSyferLock";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameLogin = @"group.net.infosec.MotionPro";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameLogin = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+#define VIEW_CONTROLLER_ID_SMX_LOGIN @"SMXLoginViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_NEWPASS @"SMXNewPasswordViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_CONFIRM @"SMXConfirmPasswordViewControllerID"
+
+#define TABLEVIEW_HEADER_HEIGHT 15
+#define TABLEVIEW_FOOTER_HEIGHT CGFLOAT_MIN
+#define TABLEVIEW_CELL_HEIGHT 60
+#define TABLEVIEW_CELL_PADDING 10
+
+#define LABEL_TAG_ON_METHOD_CELL 1
+#define IMAGE_VIEW_TAG_ON_METHOD_CELL 2
+#define TEXTFIELD_TAG_ON_USERNAME_CELL 1
+#define TEXTFIELD_TAG_ON_PASSWORD_CELL 1
+
+#define DUMMY_PASSWD @"##&&**"
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define RADIUS_SAVE_PWD @"radius_save_pwd"
+
+typedef enum {
+ kLoginCellMethodIndex = 0,
+ kLoginCellUsernameIndex,
+ kLoginCellPasswordIndex,
+ kLoginCellPassword2Index,
+ kLoginCellPassword3Index
+} LoginCellIndex;
+
+#define LOGIN_TABLE_SECTIONS 1
+
+@interface LoginViewController () {
+ DropMenuView *_methodMenu;
+
+ BOOL _isMultiMethods;
+ BOOL _isOAuthMethods;
+
+ NSArray *_allMethodNames;
+ NSArray *_allMethodDescs;
+ NSArray *_currentTableCells;
+
+ NSArray *_realPasswords;
+
+ VPNAccount *_account;
+ BOOL _isSMX;
+ BOOL _isSyferLock;
+}
+
+@property (nonatomic, readonly) NSString *currentMethod;
+@property (nonatomic) NSUInteger currentMethodIndex;
+@property (nonatomic, readonly) NSArray *currentTableCells;
+@property (nonatomic, readonly) NSArray *allMethodNames;
+@property (nonatomic, readonly) NSArray *allMethodDescs;
+@property (nonatomic, strong) NSArray *methodActions;
+@property (nonatomic, strong) NSArray *methodRequests;
+@property (nonatomic, strong) AAAManager *model;
+@property (nonatomic, strong) UITextField *usernameTextField;
+@property (nonatomic, strong) UITextField *password1TextField;
+@property (nonatomic, strong) UITextField *password2TextField;
+@property (nonatomic, strong) UITextField *password3TextField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableViewHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+
+@property (strong, nonatomic) UIAlertController *alertController;
+@property (weak, nonatomic) IBOutlet UILabel *methodNameLable;
+@property (nonatomic, strong) Gateway *gateWay;
+@property (assign, nonatomic) auth_type_t currentMethodType;
+
+@end
+
+@implementation LoginViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+ self.model = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.model = [AAAManager sharedInstance];
+ self.gateWay = [[[GatewayModel alloc] init] currentGatewayUpInside];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+
+ [self enableHideKeyboard];
+ [self setLoginButtonAppearance];
+
+ [self getSavedPassword];
+ [self initMethodView];
+ [self tryToAutoLogin];
+
+ //iOS15新特性
+ if (@available(iOS 15.0, *)) {
+
+ self.tableView.sectionHeaderTopPadding = 0;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ NSArray *allDescs = self.allMethodDescs;
+ if (allDescs && allDescs.count > 0) {
+ NSString *methodDesc = [allDescs objectAtIndex:_currentMethodIndex];
+ NSArray *parsedMethodDesc = [self parseMethodDesc:methodDesc];
+ if (parsedMethodDesc.count > 1) {
+ NSString *methodInfo;
+ for (int i = 0; i < parsedMethodDesc.count; i++) {
+ if ([[parsedMethodDesc objectAtIndex:i] containsString:KEY_METHOD_OAUTH]) {
+ methodInfo = [parsedMethodDesc objectAtIndex:i];
+ break;
+ }
+ }
+
+ self.methodActions = [self parseMethodAction:methodInfo];
+ self.methodRequests = [self parseMethodRequest:methodInfo];
+ ANInfo(@"Oauth method action=%@, request =%@", self.methodActions, self.methodRequests);
+ NSString *oAuthurlInfo;
+
+ for (int i = 0; i < self.methodActions.count; i++) {
+ int iAction = [[self.methodActions objectAtIndex:i] intValue] - 1;
+ if (iAction < self.methodRequests.count) {
+ oAuthurlInfo = [self.methodRequests objectAtIndex:iAction];
+ ANInfo(@"Oauth url info=%@", oAuthurlInfo);
+ }
+
+ if ([oAuthurlInfo length] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, get oAuth info failed.",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ return;
+ }
+ if ([oAuthurlInfo containsString:@"http://"] || [oAuthurlInfo containsString:@"https://"]) {
+ OpenURL([NSURL URLWithString:oAuthurlInfo]); // Install app.
+ return;
+ }
+ if ([self saveOAuthCodeLoginInfo:oAuthurlInfo]) {
+ ANInfo(@"launch customer app and save oauth code info.");
+ break;
+ }
+ }
+
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+ return;
+ }
+ }
+
+ NSInteger passwordCount = _isMultiMethods ? _currentTableCells.count - 2 : _currentTableCells.count - 1; // Substract method & username fields.
+ if (passwordCount > 0) {
+ if (![self checkPasswordFieldWithPasswordCount:passwordCount]) {
+ return;
+ }
+ }
+
+ [self login];
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)setLoginButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+- (void)initMethodView {
+ if ([self allAAAMethods].count == 0) {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Incorrect server configuration!",nil)
+ action:^{
+ [weakSelf cancelLogin];
+ }];
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else if ([self allAAAMethods].count > 1) {
+ _isMultiMethods = YES;
+ }else if ([self allAAAMethods].count > 0 && self.model.isOAuthType){ //认证方式
+
+ _isMultiMethods = YES;
+ }
+
+ _currentMethodIndex = 0;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+ if (_currentTableCells.count == 0) {
+ // Only deviceID auth, auto login.
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [weakSelf login];
+ });
+ }
+}
+
+- (NSArray *)allAAAMethods {
+ return [self.model allAAAMehtods];
+}
+
+#pragma mark - Properties
+
+- (NSString *)currentMethod {
+ NSArray *allNames = self.allMethodNames;
+ if (!allNames || allNames.count == 0) {
+ return nil;
+ } else {
+ return [allNames objectAtIndex:_currentMethodIndex];
+ }
+}
+
+-(auth_type_t) currentMethodType{
+
+ NSArray *typeArray = [self allAAAMethods];
+
+ if (!typeArray || typeArray.count == 0) {
+ return -1;
+ } else {
+
+ AAAMethod *method = [typeArray objectAtIndex:_currentMethodIndex];
+ if (method != nil){
+
+ return method.authType;
+ }
+ }
+ return -1;
+}
+
+- (void)setCurrentMethodIndex:(NSUInteger)currentMethodIndex {
+ if (_currentMethodIndex == currentMethodIndex) {
+ return;
+ }
+
+ _currentMethodIndex = currentMethodIndex;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+}
+
+- (NSArray*)allMethodNames {
+ if (_allMethodNames != nil) {
+ return _allMethodNames;
+ }
+
+ NSMutableArray *names = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [names addObject:method.name];
+ }
+
+ _allMethodNames = names;
+
+ return _allMethodNames;
+}
+
+- (NSArray*)allMethodDescs {
+ if (_allMethodDescs != nil) {
+ return _allMethodDescs;
+ }
+
+ NSMutableArray *descs = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [descs addObject:method.methodDescription];
+ }
+
+ _allMethodDescs = descs;
+
+ return _allMethodDescs;
+}
+
+#pragma mark - Parse Method
+
+- (NSArray *)parseMethodDesc:(NSString *)methodDesc {
+ NSMutableArray *methodParsed = [[NSMutableArray alloc] init];
+
+ if ([methodDesc containsString:KEY_METHOD_OAUTH] && [methodDesc containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSCharacterSet *delimiters = [NSCharacterSet characterSetWithCharactersInString:@"()"];
+ return [methodDesc componentsSeparatedByCharactersInSet:delimiters];
+ } else {
+ [methodParsed addObject:methodDesc];
+ }
+
+ return methodParsed;
+}
+
+- (NSArray *)parseMethodAction:(NSString *)methodInfo {
+ NSString *methodAction;
+ NSMutableArray *actionArray = [[NSMutableArray alloc] init];
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodInfo = [methodInfoArray objectAtIndex:i];
+ if ([methodInfo containsString:KEY_METHOD_ACTION]) {
+ NSRange range = [methodInfo rangeOfString:KEY_METHOD_ACTION];
+ methodInfo = [methodInfo substringFromIndex:range.location + range.length];
+ NSArray *methodActionArray = [methodInfo componentsSeparatedByString:@"&"];
+ for(int j = 0; j < methodActionArray.count; j++) {
+ methodInfo = [methodActionArray objectAtIndex:j];
+ if ([methodInfo containsString:KEY_METHOD_MOBILE]) {
+ range = [methodInfo rangeOfString:KEY_METHOD_MOBILE];
+ methodAction = [methodInfo substringFromIndex:range.location + range.length];
+
+ break;
+ }
+ }
+ }
+ }
+
+ if (methodAction.length > 0) {
+ for (int i = 0; i < methodAction.length; i ++) {
+ NSString *temp = [methodAction substringWithRange:NSMakeRange(i, 1)];
+ [actionArray addObject:temp];
+ }
+ }
+ }
+
+ return actionArray;
+}
+
+- (NSArray *)parseMethodRequest:(NSString *)methodInfo {
+ NSMutableArray *methodRequestArray = [[NSMutableArray alloc] init];
+ NSString *methodBuf;
+ NSArray *methodReqArrayBuf;
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodBuf = [methodInfoArray objectAtIndex:i];
+ if ([methodBuf containsString:@"request"]) {
+ methodReqArrayBuf = [methodBuf componentsSeparatedByString:@"&"];
+ break;
+ }
+ }
+
+ for (int i = 0; i < methodReqArrayBuf.count; i ++) {
+ NSString *req = [methodReqArrayBuf objectAtIndex:i];
+ req = [req substringFromIndex:9];
+ [methodRequestArray addObject:req];
+ }
+ }
+
+ return methodRequestArray;
+}
+
+- (BOOL)saveOAuthCodeLoginInfo:(NSString *)oauthInfo {
+ if (![oauthInfo containsString:KEY_METHOD_RELIAO]) {
+ return NO;
+ }
+
+ NSString *reliaoURL = @"reliao://f/vpn?action=login&callback=motionproplus%3a%2f%2fsetcode%3fcode%3d";
+ NSURL *url = [NSURL URLWithString:reliaoURL];
+
+ if (!OpenURL(url)) {
+ return NO;
+ }
+
+ oauthInfo = [oauthInfo substringToIndex:[oauthInfo rangeOfString:KEY_METHOD_RELIAO].location];
+ Gateway *gateway = [self currentGateway];
+ NSString *urlString = nil;
+ if ([gateway.port isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@", gateway.host, OAUTH_SESSION_URL, oauthInfo];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@", gateway.host, gateway.port, OAUTH_SESSION_URL, oauthInfo];
+ }
+ ANInfo(@"continue login url=%@", urlString);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameLogin];
+ [userDefaults setValue:urlString forKey:KEY_OAUTH_URL];
+
+ return YES;
+}
+
+#pragma mark - Login Related
+- (void)login {
+ ANInfo(@"------------>Start login...<------------");
+
+ [self.view endEditing:YES];
+
+ [self getCurrentMethod];
+
+ VPNAccount *account = [self inputResult];
+ NSLog(@"vpn account on login: %@",account);
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ self.model.errorCode = 0; // Success
+ [self.model continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (void)cancelLogin {
+ [self showLoginActivity:NO];
+
+ [self.model cancelLoginTapped];
+}
+
+- (VPNAccount *)inputResult {
+ VPNAccount * account = self.model.account;
+
+ account.loginMethod = self.currentMethod;
+ account.userName = self.usernameTextField.text;
+
+ //Get account passwords
+ if ([self.password1TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord = _realPasswords[0];
+ } else {
+ account.passWord = self.password1TextField.text;
+ }
+
+ if ([self.password2TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord2 = _realPasswords[1];
+ } else {
+ account.passWord2 = self.password2TextField.text;
+ }
+
+ if ([self.password3TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord3 = _realPasswords[2];
+ } else {
+ account.passWord3 = self.password3TextField.text;
+ }
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+//Get all cells for the given method
+- (NSArray *)cellsForMethodIndex:(NSUInteger)index {
+ NSArray *methods = [self allAAAMethods];
+ if (methods == nil || methods.count == 0) {
+ ANError(@"No method found for login.");
+ return nil;
+ }
+
+ AAAMethod *method = [methods objectAtIndex:index];
+ if (method == nil) {
+ return nil;
+ }
+
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+
+ for (InputField *field in method.inputFields) {
+ UITableViewCell *cell = [self cellForInputField:field];
+ if (cell == nil) {
+ ANError(@"Unknow inputField type %d", field.type);
+ continue;
+ }
+
+ if (field.type == FieldTypeUsernameText) {
+ // Make sure Username is above password
+ [cells insertObject:cell atIndex:0];
+ } else {
+ [cells addObject:cell];
+ }
+ }
+
+ NSString *infoDesc;
+ if (_isMultiMethods) {
+ //Display the method names
+ UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:methodCellID];
+ [self initMethodMenuWithCell:cell];
+ _methodMenu.titleLabel = (UILabel *)[cell viewWithTag:1];
+ NSArray *pasedMethodDesc = [self parseMethodDesc:method.methodDescription];
+ if (pasedMethodDesc.count > 0) {
+ infoDesc = [pasedMethodDesc objectAtIndex:0];
+ } else {
+ infoDesc = method.methodDescription;
+ }
+ _methodMenu.titleLabel.text = infoDesc;
+ //Method cell shoud be at the top.
+ if (cell != nil) {
+ [cells insertObject:cell atIndex:0];
+ }
+ }
+
+ return cells;
+}
+
+// Create a cell for the inputed field.
+- (UITableViewCell *)cellForInputField:(InputField *)field {
+ UITableViewCell *cell = nil;
+
+ Gateway *gateway = [self currentGateway];
+
+ NSString *username = self.model.account.userName;
+ if (!username || username.length == 0) {
+ username = gateway.username;
+ }
+
+ NSString *passwd;
+
+ switch (field.type) {
+ case FieldTypeUsernameText: {
+ //username field
+ cell = [self.tableView dequeueReusableCellWithIdentifier:usernameCellID];
+ self.usernameTextField = (UITextField *)[cell viewWithTag:TEXTFIELD_TAG_ON_USERNAME_CELL];
+ if (field.inputString) {
+ self.usernameTextField.text = field.inputString;
+ } else {
+ self.usernameTextField.text = username;
+ }
+ break;
+ }
+ case FieldTypePasswordText: {
+ switch (field.passwordIndex) {
+ case INDEX_PASSWORD1: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password1TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password1TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password1TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD2: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password2TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password2TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[1];
+ if (passwd.length > 0) {
+ self.password2TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD3: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password3TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password3TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password3TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ return cell;
+}
+
+- (Gateway *)currentGateway {
+ NSString *url = self.model.account.vsURL;
+ NSString *port = self.model.account.vsPort;
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:url andport:port];
+
+ return gateway;
+}
+
+- (void)getSavedPassword {
+ Gateway *gateway = [self currentGateway];
+ NSString *username = gateway.username;
+
+ _realPasswords = @[@"", @"", @""];
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:gateway.port];
+ }
+
+ if (gateway.isSavePasswordEnabled) {
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:gateway.port];
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+
+ if (!gateway.isFaceOrTouchIDEnabled && !gateway.isGestureEnabled){
+
+ [self deleteMethodName];
+ [self.model.account deleteAllPasswords];
+ }
+ }
+ }
+}
+
+- (void)tryToAutoLogin {
+ Gateway *gateway = [self currentGateway];
+ BOOL showLoginDialog = gateway.isShowLoginDialogEnabled;
+
+ if (gateway.isSavePasswordEnabled) {
+ if (!showLoginDialog && (_currentTableCells.count == 1 || ![_realPasswords isEqual:@[@"", @"", @""]])) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self login];
+ });
+ }
+ }
+}
+
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return LOGIN_TABLE_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ NSInteger totalCells = _currentTableCells.count;
+ [self updateTableViewHeightWithCellsNumber:totalCells];
+ return _currentTableCells.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return _currentTableCells[indexPath.row];
+}
+
+- (void)updateTableViewHeightWithCellsNumber:(NSInteger)cells {
+ self.tableViewHeightConstraint.constant = cells * TABLEVIEW_CELL_HEIGHT + TABLEVIEW_CELL_PADDING;
+}
+
+#pragma mark - SyferLock switch
+- (BOOL)isSyferLockEnabled {
+ Gateway *gateway = [self currentGateway];
+ if (!gateway) {
+ ANInfo(@"Current gateway is nil, no syferlock can be enabled.");
+ return NO;
+ } else {
+ return gateway.isSyferLockEnabled;
+ }
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+
+ if (@available(iOS 15.0, *)){
+
+ return 0.1;
+ }
+
+ return TABLEVIEW_HEADER_HEIGHT;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return TABLEVIEW_FOOTER_HEIGHT;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.section == 0 && indexPath.row == kLoginCellMethodIndex && _isMultiMethods) { // Deal with method drop-down menu.
+ [_methodMenu showMenuOnView:self.view];
+ }
+}
+
+- (BOOL)checkPasswordFieldWithPasswordCount:(NSInteger)count {
+ enum PasswordCount {
+ kPasswordOne = 1,
+ kPasswordTwo = 2,
+ kPasswordThree = 3
+ };
+
+ BOOL result = YES;
+
+ switch (count) {
+ case kPasswordOne:
+ if ([self.password1TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordTwo:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordThree:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""] ||
+ [self.password3TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!result) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, please check username and password",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+
+ return result;
+}
+
+- (void)initMethodMenuWithCell:(UITableViewCell *)cell {
+ if (!_methodMenu) {
+ _methodMenu = [[DropMenuView alloc] initWithOrigin:CGPointMake(0, cell.frame.size.height+TABLEVIEW_HEADER_HEIGHT)];
+ _methodMenu.delegate = self;
+ _methodMenu.dataSource = self;
+ _methodMenu.transformImageView = [cell viewWithTag:IMAGE_VIEW_TAG_ON_METHOD_CELL];
+ _methodMenu.titleLabel = nil;
+ }
+
+ [_methodMenu reloadData];
+}
+
+#pragma mark menuDelegate
+
+- (NSMutableArray *)menu_filterDataArray {
+ NSMutableArray *array = nil;
+ NSArray *descs = self.allMethodDescs;
+ NSString *methodDesc;
+
+ NSInteger index = -1;
+ array = [NSMutableArray arrayWithCapacity:descs.count];
+ for (NSString *desc in descs) {
+ ++index;
+ methodDesc = desc;
+ NSArray *pasedMethodDesc = [self parseMethodDesc:desc];
+ if (pasedMethodDesc.count > 0) {
+ methodDesc = [pasedMethodDesc objectAtIndex:0];
+ }
+
+ FilterTypeModel *model = [[FilterTypeModel alloc] initWithName:methodDesc andId:[NSString stringWithFormat:@"%zi", index]];
+ [array addObject:model];
+ }
+
+ return array;
+}
+
+- (void)menu:(DropMenuView *)menu tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ self.currentMethodIndex = indexPath.row;
+
+ [self.tableView reloadData];
+}
+
+//VPN notifications handler
+- (void)handleVPNNotification:(NSNotification *)notification {
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+ BOOL showAlert = YES;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!_isSMX) {
+ // Save passwords for non-SMX login.
+ [self savePasswordsOfAccount:manager.account];
+ }
+ [self finishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ [self finishLogin:NO];
+ break;
+ }
+ case VPN_CB_DEVID_REG: {
+ if (!_isSMX) {
+ // Save the current account
+ // In SMX, the account has been saved.
+ _account = [manager.account copy];
+ } else {
+ // SMX, clean the saved password, since it is useless after register.
+ manager.account.passWord = nil;
+ }
+
+ [self performSegueWithIdentifier:kSegueToRegister sender:nil];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_DEVID_APPROVE_PENDING:
+ aMessage = NSLocalizedString(@"Your device is registering, please request manager approval",nil);
+ break;
+ case ERR_DEVID_APPROVE_DENY:
+ aMessage = NSLocalizedString(@"Register device deny, not allow register device auto approve",nil);
+ break;
+ case ERR_DEVID_USER_LIMIT:
+ aMessage = NSLocalizedString(@"User for this device has reached his or her limit",nil);
+ break;
+ case ERR_DEVID_DEV_LIMIT:
+ aMessage = NSLocalizedString(@"Device has reached its limit",nil);
+ break;
+ case ERR_WRONG_USER_PASS:
+ if (!_isSyferLock) { // DON'T remove saved password if SyferLock is enabled.
+ [self deleteMethodName];
+ [manager.account deleteAllPasswords];
+ }
+ aMessage = manager.errorInformation;
+ //aMessage = NSLocalizedString(@"Login failed, please check username and password",nil);
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_CERT_NO:
+ aMessage = NSLocalizedString(@"Client certificate not supply", nil);
+ break;
+ case ERR_CERT_INVALID_SIGNTURE:
+ aMessage = NSLocalizedString(@"Client certificate invalid signture", nil);
+ break;
+ case ERR_CERT_UNTRUSTED:
+ aMessage = NSLocalizedString(@"Client certificate untrusted", nil);
+ break;
+ case ERR_CERT_EXPIRED:
+ aMessage = NSLocalizedString(@"Client certificate expired", nil);
+ break;
+ case ERR_CERT_INVALID:
+ aMessage = NSLocalizedString(@"Client certificate invalid", nil);
+ break;
+ case ERR_CERT_REVOKED:
+ aMessage = NSLocalizedString(@"Client certificate revoked", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ // Try to show error message, only valid on viewcontroller still exists.
+ if (![self currentGateway].isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:
+ case VPN_CB_SYFERLOCK_AUTH: {
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+
+ if (!_isSyferLock) {
+ [self removePasswordsOfAccount:manager.account];
+ }
+
+ ANError(@"Error message: %@", manager.errorInformation);
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [self removePasswordsOfAccount:manager.account];
+ } else if (error == ERR_SUCCESS) {
+ //After register, we need to login again. Using the account we have saved.
+ if (!_account) {
+ _account = [AAAManager sharedInstance].account;
+ }
+ [manager continueVPNThreadWithAccount:_account];
+
+ break;
+ }
+ break;
+ }
+ case VPN_CB_SMX: {
+ _isSMX = YES;
+
+ // Save password(s) for multi-step auth.
+ [self savePasswordsOfAccount:manager.account];
+ // Save current account, and use it to login after registering.
+ _account = [manager.account copy];
+
+ // Clean passwords
+ _account.passWord = nil;
+
+ ANDebug(@"message.code VPN_CB_SMX %zi", error);
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info != NULL) {
+ ANDebug(@"smx_info->action: %d", smx_info->action);
+ switch (smx_info->action) {
+ case SMX_ACTION_INPUT_PASS:
+ case SMX_ACTION_INPUT_OLD_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_LOGIN]) {
+ //If the top controller is login controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMX sender:nil];
+ showAlert = NO;
+ }
+ break;
+ case SMX_ACTION_INPUT_NEW_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_NEWPASS]) {
+ //If the top controller is new password controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ break;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMXChangePassword sender:nil];
+ showAlert = NO;
+ }
+ break;
+
+ case SMX_ACTION_PASS_CONFIRM:
+ [self performSegueWithIdentifier:kSegueToSMXConfirmPassword sender:nil];
+ showAlert = NO;
+ break;
+
+ default:
+ break;
+ }
+
+ if (showAlert && smx_info->errmsg[0] != '\0') {
+ NSString *errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:errorMessage];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+ }
+ break;
+ }
+ case VPN_CB_VDI_AUTH: {
+ [self handleVDIAuth];
+ break;
+ }
+ case VPN_CB_SMS: {
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ case VPN_CB_SYFERLOCK_LOGIN: {
+ _isSyferLock = YES;
+ if ([self.navigationController.topViewController isKindOfClass:[SyferLockLoginViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSyferLock sender:nil];
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+// If last login method contains SMX.
+- (BOOL)isSMXAuth {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount *account = _account;
+ if (!account) {
+ account = manager.account;
+ }
+
+ NSString *currentMethod = account.loginMethod;
+
+ NSArray *methods = [self allAAAMethods];
+ for (AAAMethod *method in methods) {
+ if ([method.name isEqualToString:currentMethod]) {
+ return method.isSmx;
+ }
+ }
+
+ return NO;
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if ([self isSMXAuth]) {
+ // Get error message for SMX auth
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info && strlen(smx_info->errmsg) != 0 && [self isValidSMXAction]) {
+ errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ if (errorMessage && ![errorMessage isEqualToString:@"OK"]) {
+ return errorMessage;
+ }
+ }
+ }
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (BOOL)isValidSMXAction {
+ vpn_smx_info_t *smx_info = [AAAManager sharedInstance].smx_info;
+
+ return (smx_info->action >= SMX_ACTION_UNKNOWN && smx_info->action <= SMX_ACTION_PASS_CONFIRM);
+}
+
+- (void)handleVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ self.alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = nil;
+ account.passWord = nil;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = weakSelf.alertController.textFields[0].text; // Username text field
+ NSString *password = weakSelf.alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = username;
+ account.passWord = password;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [self.alertController addAction:confirmAction];
+ [self.alertController addAction:cancelAction];
+
+ [self presentViewController:self.alertController animated:YES completion:nil];
+}
+
+- (void)finishLogin:(BOOL)success {
+ self.alertController = nil;
+
+ __weak typeof(self) weakSelf = self;
+ [self dismissViewControllerAnimated:YES completion:^{
+ [weakSelf.delegate didFinishLogin:success];
+ }];
+}
+
+#pragma mark - Passwords
+- (void)savePasswordsOfAccount:(VPNAccount *)account {
+ Gateway *gateway = [self currentGateway];
+ if (![account.userName isEqualToString:gateway.username]){
+
+ gateway.username = account.userName;
+ [[[GatewayManager alloc] init] updateGateway:gateway];
+ }
+
+ if (account.userName){
+
+ [self saveMethodName];
+ [self savePassWord:account];
+ return;
+ }
+
+ if (gateway.username) { // Only remember password when username is configured.
+
+ [self savePassWord:account];
+ } else {
+ ANDebug(@"Password will be deleted, because the login user is different from the one in settings.");
+
+ [self deleteMethodName];
+ [account deleteAllPasswords];
+ }
+}
+
+-(void) savePassWord: (VPNAccount *) account
+{
+ NSMutableArray *passwords = [[NSMutableArray alloc] init];
+ if (account.passWord) {
+ [passwords addObject:[account.passWord copy]];
+ }
+
+ Gateway *gateway = [self currentGateway];
+
+ if (![self isRadiusSavePass:account.loginMethod]){
+
+ gateway.isRadiusPWD = NO;
+ if (account.passWord2) {
+ [passwords addObject:[account.passWord2 copy]];
+ }
+ if (account.passWord3) {
+ [passwords addObject:[account.passWord3 copy]];
+ }
+ }else{
+
+ gateway.isRadiusPWD = YES;
+ }
+
+ [PasswordManager savePasswords:passwords forHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+-(BOOL) isRadiusSavePass: (NSString *) methodName
+{
+ if (self.allMethodDescs.count < 1 || ISNULLSTR(methodName)){
+
+ return NO;
+ }
+
+ NSInteger acount = [self.allMethodNames indexOfObject:methodName];
+
+ if (acount < 0){
+
+ return NO;
+ }
+
+ NSString *methodDesc = [_allMethodDescs objectAtIndex:acount];
+ if ([methodDesc rangeOfString:RADIUS_SAVE_PWD].location != NSNotFound){
+
+ ANInfo(@"LoginView-isRadiusSavePass- did not save pwd");
+ return YES;
+ }
+
+ return NO;
+}
+
+-(void) saveMethodName
+{
+ NSString *methodName = self.currentMethod ?: (_methodMenu.titleLabel.text ?: @"");
+ NSString *userName = _usernameTextField.text ?: @"";
+ if ([methodName isEqualToString:@""]){
+
+ methodName = @"ldb";
+ }
+
+ NSString *methodType = [Singleton sharedSingleton].isSupportAuth ? @"0" : @"1";
+ NSDictionary *verifyDic = @{@"methodName" : methodName, @"userName" : userName, @"methodType" : methodType};
+ [Singleton setCurrentGatewayMethod:verifyDic andKey:self.gateWay];
+}
+
+-(void) getCurrentMethod
+{
+ auth_type_t type = self.currentMethodType;
+ if (type == AUTH_LOCALDB || type == AUTH_LDAP || type == AUTH_RADIUS || type == AUTH_RADIUS_ACCOUNT ||
+ type == AUTH_DEVID || type == AUTH_HTTP || type == AUTH_CERTIFICATE){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ if (type == AUTH_CERTIFICATE){
+
+ _usernameTextField.text = @"";
+ }
+}
+
+-(void) deleteMethodName
+{
+ [Singleton setCurrentGatewayMethod:@{} andKey:self.gateWay];
+}
+
+- (void)removePasswordsOfAccount:(VPNAccount *)account {
+ [PasswordManager removePasswordsOfHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.usernameTextField) {
+ [self.usernameTextField resignFirstResponder];
+ if (_currentTableCells.count > 1) {
+ [self.password1TextField becomeFirstResponder];
+ }
+ }
+
+ return YES;
+}
+
+#pragma mark - ANViewControllerSwitchProtocol
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option {
+ if (sender) {
+ self.delegate = sender;
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.MotionPro
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.MotionPro (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.MotionPro (working copy)
@@ -0,0 +1,1346 @@
+//
+// LoginViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/19.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "ArrayVPNWrapper.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "DropMenuView.h"
+#import "ANPopupDialog.h"
+#import "FilterTypeModel.h"
+#import "UIDevice+Hardware.h"
+#import "SMSViewController.h"
+#import "SyferLockLoginViewController.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "LoginViewController.h"
+#import "GatewayModel.h"
+#import "Singleton.h"
+
+static NSString * const methodCellID = @"LoginMethodCell";
+static NSString * const usernameCellID = @"LoginUsernameCell";
+static NSString * const passwordCellID = @"LoginPasswordCell";
+
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+static NSString * const kSegueToRegister = @"LoginToRegister";
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToSMX = @"LoginToSMX";
+static NSString * const kSegueToSMXChangePassword = @"LoginToSMXChangePassword";
+static NSString * const kSegueToSMXConfirmPassword = @"LoginToSMXConfirmPassword";
+static NSString * const kSegueToSyferLock = @"LoginToSyferLock";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameLogin = @"group.net.arraynetworks.MotionPro";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameLogin = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+#define VIEW_CONTROLLER_ID_SMX_LOGIN @"SMXLoginViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_NEWPASS @"SMXNewPasswordViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_CONFIRM @"SMXConfirmPasswordViewControllerID"
+
+#define TABLEVIEW_HEADER_HEIGHT 15
+#define TABLEVIEW_FOOTER_HEIGHT CGFLOAT_MIN
+#define TABLEVIEW_CELL_HEIGHT 60
+#define TABLEVIEW_CELL_PADDING 10
+
+#define LABEL_TAG_ON_METHOD_CELL 1
+#define IMAGE_VIEW_TAG_ON_METHOD_CELL 2
+#define TEXTFIELD_TAG_ON_USERNAME_CELL 1
+#define TEXTFIELD_TAG_ON_PASSWORD_CELL 1
+
+#define DUMMY_PASSWD @"##&&**"
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define RADIUS_SAVE_PWD @"radius_save_pwd"
+
+typedef enum {
+ kLoginCellMethodIndex = 0,
+ kLoginCellUsernameIndex,
+ kLoginCellPasswordIndex,
+ kLoginCellPassword2Index,
+ kLoginCellPassword3Index
+} LoginCellIndex;
+
+#define LOGIN_TABLE_SECTIONS 1
+
+@interface LoginViewController () {
+ DropMenuView *_methodMenu;
+
+ BOOL _isMultiMethods;
+ BOOL _isOAuthMethods;
+
+ NSArray *_allMethodNames;
+ NSArray *_allMethodDescs;
+ NSArray *_currentTableCells;
+
+ NSArray *_realPasswords;
+
+ VPNAccount *_account;
+ BOOL _isSMX;
+ BOOL _isSyferLock;
+}
+
+@property (nonatomic, readonly) NSString *currentMethod;
+@property (nonatomic) NSUInteger currentMethodIndex;
+@property (nonatomic, readonly) NSArray *currentTableCells;
+@property (nonatomic, readonly) NSArray *allMethodNames;
+@property (nonatomic, readonly) NSArray *allMethodDescs;
+@property (nonatomic, strong) NSArray *methodActions;
+@property (nonatomic, strong) NSArray *methodRequests;
+@property (nonatomic, strong) AAAManager *model;
+@property (nonatomic, strong) UITextField *usernameTextField;
+@property (nonatomic, strong) UITextField *password1TextField;
+@property (nonatomic, strong) UITextField *password2TextField;
+@property (nonatomic, strong) UITextField *password3TextField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableViewHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+
+@property (strong, nonatomic) UIAlertController *alertController;
+@property (weak, nonatomic) IBOutlet UILabel *methodNameLable;
+@property (nonatomic, strong) Gateway *gateWay;
+@property (assign, nonatomic) auth_type_t currentMethodType;
+
+@end
+
+@implementation LoginViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+ self.model = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.model = [AAAManager sharedInstance];
+ self.gateWay = [[[GatewayModel alloc] init] currentGatewayUpInside];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+
+ [self enableHideKeyboard];
+ [self setLoginButtonAppearance];
+
+ [self getSavedPassword];
+ [self initMethodView];
+ [self tryToAutoLogin];
+
+ //iOS15新特性
+ if (@available(iOS 15.0, *)) {
+
+ self.tableView.sectionHeaderTopPadding = 0;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ NSArray *allDescs = self.allMethodDescs;
+ if (allDescs && allDescs.count > 0) {
+ NSString *methodDesc = [allDescs objectAtIndex:_currentMethodIndex];
+ NSArray *parsedMethodDesc = [self parseMethodDesc:methodDesc];
+ if (parsedMethodDesc.count > 1) {
+ NSString *methodInfo;
+ for (int i = 0; i < parsedMethodDesc.count; i++) {
+ if ([[parsedMethodDesc objectAtIndex:i] containsString:KEY_METHOD_OAUTH]) {
+ methodInfo = [parsedMethodDesc objectAtIndex:i];
+ break;
+ }
+ }
+
+ self.methodActions = [self parseMethodAction:methodInfo];
+ self.methodRequests = [self parseMethodRequest:methodInfo];
+ ANInfo(@"Oauth method action=%@, request =%@", self.methodActions, self.methodRequests);
+ NSString *oAuthurlInfo;
+
+ for (int i = 0; i < self.methodActions.count; i++) {
+ int iAction = [[self.methodActions objectAtIndex:i] intValue] - 1;
+ if (iAction < self.methodRequests.count) {
+ oAuthurlInfo = [self.methodRequests objectAtIndex:iAction];
+ ANInfo(@"Oauth url info=%@", oAuthurlInfo);
+ }
+
+ if ([oAuthurlInfo length] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, get oAuth info failed.",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ return;
+ }
+ if ([oAuthurlInfo containsString:@"http://"] || [oAuthurlInfo containsString:@"https://"]) {
+ OpenURL([NSURL URLWithString:oAuthurlInfo]); // Install app.
+ return;
+ }
+ if ([self saveOAuthCodeLoginInfo:oAuthurlInfo]) {
+ ANInfo(@"launch customer app and save oauth code info.");
+ break;
+ }
+ }
+
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+ return;
+ }
+ }
+
+ NSInteger passwordCount = _isMultiMethods ? _currentTableCells.count - 2 : _currentTableCells.count - 1; // Substract method & username fields.
+ if (passwordCount > 0) {
+ if (![self checkPasswordFieldWithPasswordCount:passwordCount]) {
+ return;
+ }
+ }
+
+ [self login];
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)setLoginButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+- (void)initMethodView {
+ if ([self allAAAMethods].count == 0) {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Incorrect server configuration!",nil)
+ action:^{
+ [weakSelf cancelLogin];
+ }];
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else if ([self allAAAMethods].count > 1) {
+ _isMultiMethods = YES;
+ }else if ([self allAAAMethods].count > 0 && self.model.isOAuthType){ //认证方式
+
+ _isMultiMethods = YES;
+ }
+
+ _currentMethodIndex = 0;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+ if (_currentTableCells.count == 0) {
+ // Only deviceID auth, auto login.
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [weakSelf login];
+ });
+ }
+}
+
+- (NSArray *)allAAAMethods {
+ return [self.model allAAAMehtods];
+}
+
+#pragma mark - Properties
+
+- (NSString *)currentMethod {
+ NSArray *allNames = self.allMethodNames;
+ if (!allNames || allNames.count == 0) {
+ return nil;
+ } else {
+ return [allNames objectAtIndex:_currentMethodIndex];
+ }
+}
+
+-(auth_type_t) currentMethodType{
+
+ NSArray *typeArray = [self allAAAMethods];
+
+ if (!typeArray || typeArray.count == 0) {
+ return -1;
+ } else {
+
+ AAAMethod *method = [typeArray objectAtIndex:_currentMethodIndex];
+ if (method != nil){
+
+ return method.authType;
+ }
+ }
+ return -1;
+}
+
+- (void)setCurrentMethodIndex:(NSUInteger)currentMethodIndex {
+ if (_currentMethodIndex == currentMethodIndex) {
+ return;
+ }
+
+ _currentMethodIndex = currentMethodIndex;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+}
+
+- (NSArray*)allMethodNames {
+ if (_allMethodNames != nil) {
+ return _allMethodNames;
+ }
+
+ NSMutableArray *names = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [names addObject:method.name];
+ }
+
+ _allMethodNames = names;
+
+ return _allMethodNames;
+}
+
+- (NSArray*)allMethodDescs {
+ if (_allMethodDescs != nil) {
+ return _allMethodDescs;
+ }
+
+ NSMutableArray *descs = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [descs addObject:method.methodDescription];
+ }
+
+ _allMethodDescs = descs;
+
+ return _allMethodDescs;
+}
+
+#pragma mark - Parse Method
+
+- (NSArray *)parseMethodDesc:(NSString *)methodDesc {
+ NSMutableArray *methodParsed = [[NSMutableArray alloc] init];
+
+ if ([methodDesc containsString:KEY_METHOD_OAUTH] && [methodDesc containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSCharacterSet *delimiters = [NSCharacterSet characterSetWithCharactersInString:@"()"];
+ return [methodDesc componentsSeparatedByCharactersInSet:delimiters];
+ } else {
+ [methodParsed addObject:methodDesc];
+ }
+
+ return methodParsed;
+}
+
+- (NSArray *)parseMethodAction:(NSString *)methodInfo {
+ NSString *methodAction;
+ NSMutableArray *actionArray = [[NSMutableArray alloc] init];
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodInfo = [methodInfoArray objectAtIndex:i];
+ if ([methodInfo containsString:KEY_METHOD_ACTION]) {
+ NSRange range = [methodInfo rangeOfString:KEY_METHOD_ACTION];
+ methodInfo = [methodInfo substringFromIndex:range.location + range.length];
+ NSArray *methodActionArray = [methodInfo componentsSeparatedByString:@"&"];
+ for(int j = 0; j < methodActionArray.count; j++) {
+ methodInfo = [methodActionArray objectAtIndex:j];
+ if ([methodInfo containsString:KEY_METHOD_MOBILE]) {
+ range = [methodInfo rangeOfString:KEY_METHOD_MOBILE];
+ methodAction = [methodInfo substringFromIndex:range.location + range.length];
+
+ break;
+ }
+ }
+ }
+ }
+
+ if (methodAction.length > 0) {
+ for (int i = 0; i < methodAction.length; i ++) {
+ NSString *temp = [methodAction substringWithRange:NSMakeRange(i, 1)];
+ [actionArray addObject:temp];
+ }
+ }
+ }
+
+ return actionArray;
+}
+
+- (NSArray *)parseMethodRequest:(NSString *)methodInfo {
+ NSMutableArray *methodRequestArray = [[NSMutableArray alloc] init];
+ NSString *methodBuf;
+ NSArray *methodReqArrayBuf;
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodBuf = [methodInfoArray objectAtIndex:i];
+ if ([methodBuf containsString:@"request"]) {
+ methodReqArrayBuf = [methodBuf componentsSeparatedByString:@"&"];
+ break;
+ }
+ }
+
+ for (int i = 0; i < methodReqArrayBuf.count; i ++) {
+ NSString *req = [methodReqArrayBuf objectAtIndex:i];
+ req = [req substringFromIndex:9];
+ [methodRequestArray addObject:req];
+ }
+ }
+
+ return methodRequestArray;
+}
+
+- (BOOL)saveOAuthCodeLoginInfo:(NSString *)oauthInfo {
+ if (![oauthInfo containsString:KEY_METHOD_RELIAO]) {
+ return NO;
+ }
+
+ NSString *reliaoURL = @"reliao://f/vpn?action=login&callback=motionproplus%3a%2f%2fsetcode%3fcode%3d";
+ NSURL *url = [NSURL URLWithString:reliaoURL];
+
+ if (!OpenURL(url)) {
+ return NO;
+ }
+
+ oauthInfo = [oauthInfo substringToIndex:[oauthInfo rangeOfString:KEY_METHOD_RELIAO].location];
+ Gateway *gateway = [self currentGateway];
+ NSString *urlString = nil;
+ if ([gateway.port isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@", gateway.host, OAUTH_SESSION_URL, oauthInfo];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@", gateway.host, gateway.port, OAUTH_SESSION_URL, oauthInfo];
+ }
+ ANInfo(@"continue login url=%@", urlString);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameLogin];
+ [userDefaults setValue:urlString forKey:KEY_OAUTH_URL];
+
+ return YES;
+}
+
+#pragma mark - Login Related
+- (void)login {
+ ANInfo(@"------------>Start login...<------------");
+
+ [self.view endEditing:YES];
+
+ [self getCurrentMethod];
+
+ VPNAccount *account = [self inputResult];
+ NSLog(@"vpn account on login: %@",account);
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ self.model.errorCode = 0; // Success
+ [self.model continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (void)cancelLogin {
+ [self showLoginActivity:NO];
+
+ [self.model cancelLoginTapped];
+}
+
+- (VPNAccount *)inputResult {
+ VPNAccount * account = self.model.account;
+
+ account.loginMethod = self.currentMethod;
+ account.userName = self.usernameTextField.text;
+
+ //Get account passwords
+ if ([self.password1TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord = _realPasswords[0];
+ } else {
+ account.passWord = self.password1TextField.text;
+ }
+
+ if ([self.password2TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord2 = _realPasswords[1];
+ } else {
+ account.passWord2 = self.password2TextField.text;
+ }
+
+ if ([self.password3TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord3 = _realPasswords[2];
+ } else {
+ account.passWord3 = self.password3TextField.text;
+ }
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+//Get all cells for the given method
+- (NSArray *)cellsForMethodIndex:(NSUInteger)index {
+ NSArray *methods = [self allAAAMethods];
+ if (methods == nil || methods.count == 0) {
+ ANError(@"No method found for login.");
+ return nil;
+ }
+
+ AAAMethod *method = [methods objectAtIndex:index];
+ if (method == nil) {
+ return nil;
+ }
+
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+
+ for (InputField *field in method.inputFields) {
+ UITableViewCell *cell = [self cellForInputField:field];
+ if (cell == nil) {
+ ANError(@"Unknow inputField type %d", field.type);
+ continue;
+ }
+
+ if (field.type == FieldTypeUsernameText) {
+ // Make sure Username is above password
+ [cells insertObject:cell atIndex:0];
+ } else {
+ [cells addObject:cell];
+ }
+ }
+
+ NSString *infoDesc;
+ if (_isMultiMethods) {
+ //Display the method names
+ UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:methodCellID];
+ [self initMethodMenuWithCell:cell];
+ _methodMenu.titleLabel = (UILabel *)[cell viewWithTag:1];
+ NSArray *pasedMethodDesc = [self parseMethodDesc:method.methodDescription];
+ if (pasedMethodDesc.count > 0) {
+ infoDesc = [pasedMethodDesc objectAtIndex:0];
+ } else {
+ infoDesc = method.methodDescription;
+ }
+ _methodMenu.titleLabel.text = infoDesc;
+ //Method cell shoud be at the top.
+ if (cell != nil) {
+ [cells insertObject:cell atIndex:0];
+ }
+ }
+
+ return cells;
+}
+
+// Create a cell for the inputed field.
+- (UITableViewCell *)cellForInputField:(InputField *)field {
+ UITableViewCell *cell = nil;
+
+ Gateway *gateway = [self currentGateway];
+
+ NSString *username = self.model.account.userName;
+ if (!username || username.length == 0) {
+ username = gateway.username;
+ }
+
+ NSString *passwd;
+
+ switch (field.type) {
+ case FieldTypeUsernameText: {
+ //username field
+ cell = [self.tableView dequeueReusableCellWithIdentifier:usernameCellID];
+ self.usernameTextField = (UITextField *)[cell viewWithTag:TEXTFIELD_TAG_ON_USERNAME_CELL];
+ if (field.inputString) {
+ self.usernameTextField.text = field.inputString;
+ } else {
+ self.usernameTextField.text = username;
+ }
+ break;
+ }
+ case FieldTypePasswordText: {
+ switch (field.passwordIndex) {
+ case INDEX_PASSWORD1: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password1TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password1TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password1TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD2: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password2TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password2TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[1];
+ if (passwd.length > 0) {
+ self.password2TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD3: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password3TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password3TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password3TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ return cell;
+}
+
+- (Gateway *)currentGateway {
+ NSString *url = self.model.account.vsURL;
+ NSString *port = self.model.account.vsPort;
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:url andport:port];
+
+ return gateway;
+}
+
+- (void)getSavedPassword {
+ Gateway *gateway = [self currentGateway];
+ NSString *username = gateway.username;
+
+ _realPasswords = @[@"", @"", @""];
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:gateway.port];
+ }
+
+ if (gateway.isSavePasswordEnabled) {
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:gateway.port];
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+
+ if (!gateway.isFaceOrTouchIDEnabled && !gateway.isGestureEnabled){
+
+ [self deleteMethodName];
+ [self.model.account deleteAllPasswords];
+ }
+ }
+ }
+}
+
+- (void)tryToAutoLogin {
+ Gateway *gateway = [self currentGateway];
+ BOOL showLoginDialog = gateway.isShowLoginDialogEnabled;
+
+ if (gateway.isSavePasswordEnabled) {
+ if (!showLoginDialog && (_currentTableCells.count == 1 || ![_realPasswords isEqual:@[@"", @"", @""]])) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self login];
+ });
+ }
+ }
+}
+
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return LOGIN_TABLE_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ NSInteger totalCells = _currentTableCells.count;
+ [self updateTableViewHeightWithCellsNumber:totalCells];
+ return _currentTableCells.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return _currentTableCells[indexPath.row];
+}
+
+- (void)updateTableViewHeightWithCellsNumber:(NSInteger)cells {
+ self.tableViewHeightConstraint.constant = cells * TABLEVIEW_CELL_HEIGHT + TABLEVIEW_CELL_PADDING;
+}
+
+#pragma mark - SyferLock switch
+- (BOOL)isSyferLockEnabled {
+ Gateway *gateway = [self currentGateway];
+ if (!gateway) {
+ ANInfo(@"Current gateway is nil, no syferlock can be enabled.");
+ return NO;
+ } else {
+ return gateway.isSyferLockEnabled;
+ }
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+
+ if (@available(iOS 15.0, *)){
+
+ return 0.1;
+ }
+
+ return TABLEVIEW_HEADER_HEIGHT;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return TABLEVIEW_FOOTER_HEIGHT;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.section == 0 && indexPath.row == kLoginCellMethodIndex && _isMultiMethods) { // Deal with method drop-down menu.
+ [_methodMenu showMenuOnView:self.view];
+ }
+}
+
+- (BOOL)checkPasswordFieldWithPasswordCount:(NSInteger)count {
+ enum PasswordCount {
+ kPasswordOne = 1,
+ kPasswordTwo = 2,
+ kPasswordThree = 3
+ };
+
+ BOOL result = YES;
+
+ switch (count) {
+ case kPasswordOne:
+ if ([self.password1TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordTwo:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordThree:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""] ||
+ [self.password3TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!result) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, please check username and password",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+
+ return result;
+}
+
+- (void)initMethodMenuWithCell:(UITableViewCell *)cell {
+ if (!_methodMenu) {
+ _methodMenu = [[DropMenuView alloc] initWithOrigin:CGPointMake(0, cell.frame.size.height+TABLEVIEW_HEADER_HEIGHT)];
+ _methodMenu.delegate = self;
+ _methodMenu.dataSource = self;
+ _methodMenu.transformImageView = [cell viewWithTag:IMAGE_VIEW_TAG_ON_METHOD_CELL];
+ _methodMenu.titleLabel = nil;
+ }
+
+ [_methodMenu reloadData];
+}
+
+#pragma mark menuDelegate
+
+- (NSMutableArray *)menu_filterDataArray {
+ NSMutableArray *array = nil;
+ NSArray *descs = self.allMethodDescs;
+ NSString *methodDesc;
+
+ NSInteger index = -1;
+ array = [NSMutableArray arrayWithCapacity:descs.count];
+ for (NSString *desc in descs) {
+ ++index;
+ methodDesc = desc;
+ NSArray *pasedMethodDesc = [self parseMethodDesc:desc];
+ if (pasedMethodDesc.count > 0) {
+ methodDesc = [pasedMethodDesc objectAtIndex:0];
+ }
+
+ FilterTypeModel *model = [[FilterTypeModel alloc] initWithName:methodDesc andId:[NSString stringWithFormat:@"%zi", index]];
+ [array addObject:model];
+ }
+
+ return array;
+}
+
+- (void)menu:(DropMenuView *)menu tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ self.currentMethodIndex = indexPath.row;
+
+ [self.tableView reloadData];
+}
+
+//VPN notifications handler
+- (void)handleVPNNotification:(NSNotification *)notification {
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+ BOOL showAlert = YES;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!_isSMX) {
+ // Save passwords for non-SMX login.
+ [self savePasswordsOfAccount:manager.account];
+ }
+ [self finishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ [self finishLogin:NO];
+ break;
+ }
+ case VPN_CB_DEVID_REG: {
+ if (!_isSMX) {
+ // Save the current account
+ // In SMX, the account has been saved.
+ _account = [manager.account copy];
+ } else {
+ // SMX, clean the saved password, since it is useless after register.
+ manager.account.passWord = nil;
+ }
+
+ [self performSegueWithIdentifier:kSegueToRegister sender:nil];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_DEVID_APPROVE_PENDING:
+ aMessage = NSLocalizedString(@"Your device is registering, please request manager approval",nil);
+ break;
+ case ERR_DEVID_APPROVE_DENY:
+ aMessage = NSLocalizedString(@"Register device deny, not allow register device auto approve",nil);
+ break;
+ case ERR_DEVID_USER_LIMIT:
+ aMessage = NSLocalizedString(@"User for this device has reached his or her limit",nil);
+ break;
+ case ERR_DEVID_DEV_LIMIT:
+ aMessage = NSLocalizedString(@"Device has reached its limit",nil);
+ break;
+ case ERR_WRONG_USER_PASS:
+ if (!_isSyferLock) { // DON'T remove saved password if SyferLock is enabled.
+ [self deleteMethodName];
+ [manager.account deleteAllPasswords];
+ }
+ aMessage = manager.errorInformation;
+ //aMessage = NSLocalizedString(@"Login failed, please check username and password",nil);
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_CERT_NO:
+ aMessage = NSLocalizedString(@"Client certificate not supply", nil);
+ break;
+ case ERR_CERT_INVALID_SIGNTURE:
+ aMessage = NSLocalizedString(@"Client certificate invalid signture", nil);
+ break;
+ case ERR_CERT_UNTRUSTED:
+ aMessage = NSLocalizedString(@"Client certificate untrusted", nil);
+ break;
+ case ERR_CERT_EXPIRED:
+ aMessage = NSLocalizedString(@"Client certificate expired", nil);
+ break;
+ case ERR_CERT_INVALID:
+ aMessage = NSLocalizedString(@"Client certificate invalid", nil);
+ break;
+ case ERR_CERT_REVOKED:
+ aMessage = NSLocalizedString(@"Client certificate revoked", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ // Try to show error message, only valid on viewcontroller still exists.
+ if (![self currentGateway].isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:
+ case VPN_CB_SYFERLOCK_AUTH: {
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+
+ if (!_isSyferLock) {
+ [self removePasswordsOfAccount:manager.account];
+ }
+
+ ANError(@"Error message: %@", manager.errorInformation);
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [self removePasswordsOfAccount:manager.account];
+ } else if (error == ERR_SUCCESS) {
+ //After register, we need to login again. Using the account we have saved.
+ if (!_account) {
+ _account = [AAAManager sharedInstance].account;
+ }
+ [manager continueVPNThreadWithAccount:_account];
+
+ break;
+ }
+ break;
+ }
+ case VPN_CB_SMX: {
+ _isSMX = YES;
+
+ // Save password(s) for multi-step auth.
+ [self savePasswordsOfAccount:manager.account];
+ // Save current account, and use it to login after registering.
+ _account = [manager.account copy];
+
+ // Clean passwords
+ _account.passWord = nil;
+
+ ANDebug(@"message.code VPN_CB_SMX %zi", error);
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info != NULL) {
+ ANDebug(@"smx_info->action: %d", smx_info->action);
+ switch (smx_info->action) {
+ case SMX_ACTION_INPUT_PASS:
+ case SMX_ACTION_INPUT_OLD_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_LOGIN]) {
+ //If the top controller is login controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMX sender:nil];
+ showAlert = NO;
+ }
+ break;
+ case SMX_ACTION_INPUT_NEW_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_NEWPASS]) {
+ //If the top controller is new password controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ break;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMXChangePassword sender:nil];
+ showAlert = NO;
+ }
+ break;
+
+ case SMX_ACTION_PASS_CONFIRM:
+ [self performSegueWithIdentifier:kSegueToSMXConfirmPassword sender:nil];
+ showAlert = NO;
+ break;
+
+ default:
+ break;
+ }
+
+ if (showAlert && smx_info->errmsg[0] != '\0') {
+ NSString *errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:errorMessage];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+ }
+ break;
+ }
+ case VPN_CB_VDI_AUTH: {
+ [self handleVDIAuth];
+ break;
+ }
+ case VPN_CB_SMS: {
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ case VPN_CB_SYFERLOCK_LOGIN: {
+ _isSyferLock = YES;
+ if ([self.navigationController.topViewController isKindOfClass:[SyferLockLoginViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSyferLock sender:nil];
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+// If last login method contains SMX.
+- (BOOL)isSMXAuth {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount *account = _account;
+ if (!account) {
+ account = manager.account;
+ }
+
+ NSString *currentMethod = account.loginMethod;
+
+ NSArray *methods = [self allAAAMethods];
+ for (AAAMethod *method in methods) {
+ if ([method.name isEqualToString:currentMethod]) {
+ return method.isSmx;
+ }
+ }
+
+ return NO;
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if ([self isSMXAuth]) {
+ // Get error message for SMX auth
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info && strlen(smx_info->errmsg) != 0 && [self isValidSMXAction]) {
+ errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ if (errorMessage && ![errorMessage isEqualToString:@"OK"]) {
+ return errorMessage;
+ }
+ }
+ }
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (BOOL)isValidSMXAction {
+ vpn_smx_info_t *smx_info = [AAAManager sharedInstance].smx_info;
+
+ return (smx_info->action >= SMX_ACTION_UNKNOWN && smx_info->action <= SMX_ACTION_PASS_CONFIRM);
+}
+
+- (void)handleVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ self.alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = nil;
+ account.passWord = nil;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = weakSelf.alertController.textFields[0].text; // Username text field
+ NSString *password = weakSelf.alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = username;
+ account.passWord = password;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [self.alertController addAction:confirmAction];
+ [self.alertController addAction:cancelAction];
+
+ [self presentViewController:self.alertController animated:YES completion:nil];
+}
+
+- (void)finishLogin:(BOOL)success {
+ self.alertController = nil;
+
+ __weak typeof(self) weakSelf = self;
+ [self dismissViewControllerAnimated:YES completion:^{
+ [weakSelf.delegate didFinishLogin:success];
+ }];
+}
+
+#pragma mark - Passwords
+- (void)savePasswordsOfAccount:(VPNAccount *)account {
+ Gateway *gateway = [self currentGateway];
+ if (![account.userName isEqualToString:gateway.username]){
+
+ gateway.username = account.userName;
+ [[[GatewayManager alloc] init] updateGateway:gateway];
+ }
+
+ if (account.userName){
+
+ [self saveMethodName];
+ [self savePassWord:account];
+ return;
+ }
+
+ if (gateway.username) { // Only remember password when username is configured.
+
+ [self savePassWord:account];
+ } else {
+ ANDebug(@"Password will be deleted, because the login user is different from the one in settings.");
+
+ [self deleteMethodName];
+ [account deleteAllPasswords];
+ }
+}
+
+-(void) savePassWord: (VPNAccount *) account
+{
+ NSMutableArray *passwords = [[NSMutableArray alloc] init];
+ if (account.passWord) {
+ [passwords addObject:[account.passWord copy]];
+ }
+
+ Gateway *gateway = [self currentGateway];
+
+ if (![self isRadiusSavePass:account.loginMethod]){
+
+ gateway.isRadiusPWD = NO;
+ if (account.passWord2) {
+ [passwords addObject:[account.passWord2 copy]];
+ }
+ if (account.passWord3) {
+ [passwords addObject:[account.passWord3 copy]];
+ }
+ }else{
+
+ gateway.isRadiusPWD = YES;
+ }
+
+ [PasswordManager savePasswords:passwords forHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+-(BOOL) isRadiusSavePass: (NSString *) methodName
+{
+ if (self.allMethodDescs.count < 1 || ISNULLSTR(methodName)){
+
+ return NO;
+ }
+
+ NSInteger acount = [self.allMethodNames indexOfObject:methodName];
+
+ if (acount < 0){
+
+ return NO;
+ }
+
+ NSString *methodDesc = [_allMethodDescs objectAtIndex:acount];
+ if ([methodDesc rangeOfString:RADIUS_SAVE_PWD].location != NSNotFound){
+
+ ANInfo(@"LoginView-isRadiusSavePass- did not save pwd");
+ return YES;
+ }
+
+ return NO;
+}
+
+-(void) saveMethodName
+{
+ NSString *methodName = self.currentMethod ?: (_methodMenu.titleLabel.text ?: @"");
+ NSString *userName = _usernameTextField.text ?: @"";
+ if ([methodName isEqualToString:@""]){
+
+ methodName = @"ldb";
+ }
+
+ NSString *methodType = [Singleton sharedSingleton].isSupportAuth ? @"0" : @"1";
+ NSDictionary *verifyDic = @{@"methodName" : methodName, @"userName" : userName, @"methodType" : methodType};
+ [Singleton setCurrentGatewayMethod:verifyDic andKey:self.gateWay];
+}
+
+-(void) getCurrentMethod
+{
+ auth_type_t type = self.currentMethodType;
+ if (type == AUTH_LOCALDB || type == AUTH_LDAP || type == AUTH_RADIUS || type == AUTH_RADIUS_ACCOUNT ||
+ type == AUTH_DEVID || type == AUTH_HTTP || type == AUTH_CERTIFICATE){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ if (type == AUTH_CERTIFICATE){
+
+ _usernameTextField.text = @"";
+ }
+}
+
+-(void) deleteMethodName
+{
+ [Singleton setCurrentGatewayMethod:@{} andKey:self.gateWay];
+}
+
+- (void)removePasswordsOfAccount:(VPNAccount *)account {
+ [PasswordManager removePasswordsOfHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.usernameTextField) {
+ [self.usernameTextField resignFirstResponder];
+ if (_currentTableCells.count > 1) {
+ [self.password1TextField becomeFirstResponder];
+ }
+ }
+
+ return YES;
+}
+
+#pragma mark - ANViewControllerSwitchProtocol
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option {
+ if (sender) {
+ self.delegate = sender;
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.MotionProEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.MotionProEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/LoginViewController.m.MotionProEnterprise (working copy)
@@ -0,0 +1,1346 @@
+//
+// LoginViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/19.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "ArrayVPNWrapper.h"
+#import "PasswordManager.h"
+#import "InformationToSave.h"
+#import "DropMenuView.h"
+#import "ANPopupDialog.h"
+#import "FilterTypeModel.h"
+#import "UIDevice+Hardware.h"
+#import "SMSViewController.h"
+#import "SyferLockLoginViewController.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "LoginViewController.h"
+#import "GatewayModel.h"
+#import "Singleton.h"
+
+static NSString * const methodCellID = @"LoginMethodCell";
+static NSString * const usernameCellID = @"LoginUsernameCell";
+static NSString * const passwordCellID = @"LoginPasswordCell";
+
+static NSString * const kSegueToChangePassword = @"LoginToChangePassword";
+static NSString * const kSegueToRegister = @"LoginToRegister";
+static NSString * const kSegueToChallenge = @"LoginToChallenge";
+static NSString * const kSegueToSMS = @"LoginToSMS";
+static NSString * const kSegueToSMX = @"LoginToSMX";
+static NSString * const kSegueToSMXChangePassword = @"LoginToSMXChangePassword";
+static NSString * const kSegueToSMXConfirmPassword = @"LoginToSMXConfirmPassword";
+static NSString * const kSegueToSyferLock = @"LoginToSyferLock";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameLogin = @"group.net.arraynetworks.groupenterprise";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameLogin = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+#define VIEW_CONTROLLER_ID_SMX_LOGIN @"SMXLoginViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_NEWPASS @"SMXNewPasswordViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_CONFIRM @"SMXConfirmPasswordViewControllerID"
+
+#define TABLEVIEW_HEADER_HEIGHT 15
+#define TABLEVIEW_FOOTER_HEIGHT CGFLOAT_MIN
+#define TABLEVIEW_CELL_HEIGHT 60
+#define TABLEVIEW_CELL_PADDING 10
+
+#define LABEL_TAG_ON_METHOD_CELL 1
+#define IMAGE_VIEW_TAG_ON_METHOD_CELL 2
+#define TEXTFIELD_TAG_ON_USERNAME_CELL 1
+#define TEXTFIELD_TAG_ON_PASSWORD_CELL 1
+
+#define DUMMY_PASSWD @"##&&**"
+#define OAUTH_SESSION_URL @"/prx/000/http/localh/"
+#define RADIUS_SAVE_PWD @"radius_save_pwd"
+
+typedef enum {
+ kLoginCellMethodIndex = 0,
+ kLoginCellUsernameIndex,
+ kLoginCellPasswordIndex,
+ kLoginCellPassword2Index,
+ kLoginCellPassword3Index
+} LoginCellIndex;
+
+#define LOGIN_TABLE_SECTIONS 1
+
+@interface LoginViewController () {
+ DropMenuView *_methodMenu;
+
+ BOOL _isMultiMethods;
+ BOOL _isOAuthMethods;
+
+ NSArray *_allMethodNames;
+ NSArray *_allMethodDescs;
+ NSArray *_currentTableCells;
+
+ NSArray *_realPasswords;
+
+ VPNAccount *_account;
+ BOOL _isSMX;
+ BOOL _isSyferLock;
+}
+
+@property (nonatomic, readonly) NSString *currentMethod;
+@property (nonatomic) NSUInteger currentMethodIndex;
+@property (nonatomic, readonly) NSArray *currentTableCells;
+@property (nonatomic, readonly) NSArray *allMethodNames;
+@property (nonatomic, readonly) NSArray *allMethodDescs;
+@property (nonatomic, strong) NSArray *methodActions;
+@property (nonatomic, strong) NSArray *methodRequests;
+@property (nonatomic, strong) AAAManager *model;
+@property (nonatomic, strong) UITextField *usernameTextField;
+@property (nonatomic, strong) UITextField *password1TextField;
+@property (nonatomic, strong) UITextField *password2TextField;
+@property (nonatomic, strong) UITextField *password3TextField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableViewHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+
+@property (strong, nonatomic) UIAlertController *alertController;
+@property (weak, nonatomic) IBOutlet UILabel *methodNameLable;
+@property (nonatomic, strong) Gateway *gateWay;
+@property (assign, nonatomic) auth_type_t currentMethodType;
+
+@end
+
+@implementation LoginViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+ self.model = nil;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.model = [AAAManager sharedInstance];
+ self.gateWay = [[[GatewayModel alloc] init] currentGatewayUpInside];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+
+ [self enableHideKeyboard];
+ [self setLoginButtonAppearance];
+
+ [self getSavedPassword];
+ [self initMethodView];
+ [self tryToAutoLogin];
+
+ //iOS15新特性
+ if (@available(iOS 15.0, *)) {
+
+ self.tableView.sectionHeaderTopPadding = 0;
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ NSArray *allDescs = self.allMethodDescs;
+ if (allDescs && allDescs.count > 0) {
+ NSString *methodDesc = [allDescs objectAtIndex:_currentMethodIndex];
+ NSArray *parsedMethodDesc = [self parseMethodDesc:methodDesc];
+ if (parsedMethodDesc.count > 1) {
+ NSString *methodInfo;
+ for (int i = 0; i < parsedMethodDesc.count; i++) {
+ if ([[parsedMethodDesc objectAtIndex:i] containsString:KEY_METHOD_OAUTH]) {
+ methodInfo = [parsedMethodDesc objectAtIndex:i];
+ break;
+ }
+ }
+
+ self.methodActions = [self parseMethodAction:methodInfo];
+ self.methodRequests = [self parseMethodRequest:methodInfo];
+ ANInfo(@"Oauth method action=%@, request =%@", self.methodActions, self.methodRequests);
+ NSString *oAuthurlInfo;
+
+ for (int i = 0; i < self.methodActions.count; i++) {
+ int iAction = [[self.methodActions objectAtIndex:i] intValue] - 1;
+ if (iAction < self.methodRequests.count) {
+ oAuthurlInfo = [self.methodRequests objectAtIndex:iAction];
+ ANInfo(@"Oauth url info=%@", oAuthurlInfo);
+ }
+
+ if ([oAuthurlInfo length] <= 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, get oAuth info failed.",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ return;
+ }
+ if ([oAuthurlInfo containsString:@"http://"] || [oAuthurlInfo containsString:@"https://"]) {
+ OpenURL([NSURL URLWithString:oAuthurlInfo]); // Install app.
+ return;
+ }
+ if ([self saveOAuthCodeLoginInfo:oAuthurlInfo]) {
+ ANInfo(@"launch customer app and save oauth code info.");
+ break;
+ }
+ }
+
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+ return;
+ }
+ }
+
+ NSInteger passwordCount = _isMultiMethods ? _currentTableCells.count - 2 : _currentTableCells.count - 1; // Substract method & username fields.
+ if (passwordCount > 0) {
+ if (![self checkPasswordFieldWithPasswordCount:passwordCount]) {
+ return;
+ }
+ }
+
+ [self login];
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+ [self finishLogin:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)setLoginButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+- (void)initMethodView {
+ if ([self allAAAMethods].count == 0) {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Incorrect server configuration!",nil)
+ action:^{
+ [weakSelf cancelLogin];
+ }];
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else if ([self allAAAMethods].count > 1) {
+ _isMultiMethods = YES;
+ }else if ([self allAAAMethods].count > 0 && self.model.isOAuthType){ //认证方式
+
+ _isMultiMethods = YES;
+ }
+
+ _currentMethodIndex = 0;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+ if (_currentTableCells.count == 0) {
+ // Only deviceID auth, auto login.
+ __weak typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [weakSelf login];
+ });
+ }
+}
+
+- (NSArray *)allAAAMethods {
+ return [self.model allAAAMehtods];
+}
+
+#pragma mark - Properties
+
+- (NSString *)currentMethod {
+ NSArray *allNames = self.allMethodNames;
+ if (!allNames || allNames.count == 0) {
+ return nil;
+ } else {
+ return [allNames objectAtIndex:_currentMethodIndex];
+ }
+}
+
+-(auth_type_t) currentMethodType{
+
+ NSArray *typeArray = [self allAAAMethods];
+
+ if (!typeArray || typeArray.count == 0) {
+ return -1;
+ } else {
+
+ AAAMethod *method = [typeArray objectAtIndex:_currentMethodIndex];
+ if (method != nil){
+
+ return method.authType;
+ }
+ }
+ return -1;
+}
+
+- (void)setCurrentMethodIndex:(NSUInteger)currentMethodIndex {
+ if (_currentMethodIndex == currentMethodIndex) {
+ return;
+ }
+
+ _currentMethodIndex = currentMethodIndex;
+ _currentTableCells = [self cellsForMethodIndex:_currentMethodIndex];
+}
+
+- (NSArray*)allMethodNames {
+ if (_allMethodNames != nil) {
+ return _allMethodNames;
+ }
+
+ NSMutableArray *names = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [names addObject:method.name];
+ }
+
+ _allMethodNames = names;
+
+ return _allMethodNames;
+}
+
+- (NSArray*)allMethodDescs {
+ if (_allMethodDescs != nil) {
+ return _allMethodDescs;
+ }
+
+ NSMutableArray *descs = [[NSMutableArray alloc] init];
+
+ for (AAAMethod *method in [self allAAAMethods]) {
+ [descs addObject:method.methodDescription];
+ }
+
+ _allMethodDescs = descs;
+
+ return _allMethodDescs;
+}
+
+#pragma mark - Parse Method
+
+- (NSArray *)parseMethodDesc:(NSString *)methodDesc {
+ NSMutableArray *methodParsed = [[NSMutableArray alloc] init];
+
+ if ([methodDesc containsString:KEY_METHOD_OAUTH] && [methodDesc containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSCharacterSet *delimiters = [NSCharacterSet characterSetWithCharactersInString:@"()"];
+ return [methodDesc componentsSeparatedByCharactersInSet:delimiters];
+ } else {
+ [methodParsed addObject:methodDesc];
+ }
+
+ return methodParsed;
+}
+
+- (NSArray *)parseMethodAction:(NSString *)methodInfo {
+ NSString *methodAction;
+ NSMutableArray *actionArray = [[NSMutableArray alloc] init];
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodInfo = [methodInfoArray objectAtIndex:i];
+ if ([methodInfo containsString:KEY_METHOD_ACTION]) {
+ NSRange range = [methodInfo rangeOfString:KEY_METHOD_ACTION];
+ methodInfo = [methodInfo substringFromIndex:range.location + range.length];
+ NSArray *methodActionArray = [methodInfo componentsSeparatedByString:@"&"];
+ for(int j = 0; j < methodActionArray.count; j++) {
+ methodInfo = [methodActionArray objectAtIndex:j];
+ if ([methodInfo containsString:KEY_METHOD_MOBILE]) {
+ range = [methodInfo rangeOfString:KEY_METHOD_MOBILE];
+ methodAction = [methodInfo substringFromIndex:range.location + range.length];
+
+ break;
+ }
+ }
+ }
+ }
+
+ if (methodAction.length > 0) {
+ for (int i = 0; i < methodAction.length; i ++) {
+ NSString *temp = [methodAction substringWithRange:NSMakeRange(i, 1)];
+ [actionArray addObject:temp];
+ }
+ }
+ }
+
+ return actionArray;
+}
+
+- (NSArray *)parseMethodRequest:(NSString *)methodInfo {
+ NSMutableArray *methodRequestArray = [[NSMutableArray alloc] init];
+ NSString *methodBuf;
+ NSArray *methodReqArrayBuf;
+
+ if (methodInfo && [methodInfo containsString:KEY_METHOD_MOBILE_ENABLE]) {
+ NSArray *methodInfoArray = [methodInfo componentsSeparatedByString:@"@"];
+ for (int i = 0; i < methodInfoArray.count; i++) {
+ methodBuf = [methodInfoArray objectAtIndex:i];
+ if ([methodBuf containsString:@"request"]) {
+ methodReqArrayBuf = [methodBuf componentsSeparatedByString:@"&"];
+ break;
+ }
+ }
+
+ for (int i = 0; i < methodReqArrayBuf.count; i ++) {
+ NSString *req = [methodReqArrayBuf objectAtIndex:i];
+ req = [req substringFromIndex:9];
+ [methodRequestArray addObject:req];
+ }
+ }
+
+ return methodRequestArray;
+}
+
+- (BOOL)saveOAuthCodeLoginInfo:(NSString *)oauthInfo {
+ if (![oauthInfo containsString:KEY_METHOD_RELIAO]) {
+ return NO;
+ }
+
+ NSString *reliaoURL = @"reliao://f/vpn?action=login&callback=motionproplus%3a%2f%2fsetcode%3fcode%3d";
+ NSURL *url = [NSURL URLWithString:reliaoURL];
+
+ if (!OpenURL(url)) {
+ return NO;
+ }
+
+ oauthInfo = [oauthInfo substringToIndex:[oauthInfo rangeOfString:KEY_METHOD_RELIAO].location];
+ Gateway *gateway = [self currentGateway];
+ NSString *urlString = nil;
+ if ([gateway.port isEqualToString:@"443"]) {
+ urlString = [NSString stringWithFormat:@"https://%@%@%@", gateway.host, OAUTH_SESSION_URL, oauthInfo];
+ } else {
+ urlString = [NSString stringWithFormat:@"https://%@:%@%@%@", gateway.host, gateway.port, OAUTH_SESSION_URL, oauthInfo];
+ }
+ ANInfo(@"continue login url=%@", urlString);
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameLogin];
+ [userDefaults setValue:urlString forKey:KEY_OAUTH_URL];
+
+ return YES;
+}
+
+#pragma mark - Login Related
+- (void)login {
+ ANInfo(@"------------>Start login...<------------");
+
+ [self.view endEditing:YES];
+
+ [self getCurrentMethod];
+
+ VPNAccount *account = [self inputResult];
+ NSLog(@"vpn account on login: %@",account);
+
+ if (account == nil) {
+ ANWarn(@"Cannot get account information");
+ return;
+ }
+
+ InformationToSave *info = [InformationToSave sharedInstance];
+
+ info.lastLoginAccount = account;
+ [info save];
+
+ self.model.errorCode = 0; // Success
+ [self.model continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (void)cancelLogin {
+ [self showLoginActivity:NO];
+
+ [self.model cancelLoginTapped];
+}
+
+- (VPNAccount *)inputResult {
+ VPNAccount * account = self.model.account;
+
+ account.loginMethod = self.currentMethod;
+ account.userName = self.usernameTextField.text;
+
+ //Get account passwords
+ if ([self.password1TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord = _realPasswords[0];
+ } else {
+ account.passWord = self.password1TextField.text;
+ }
+
+ if ([self.password2TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord2 = _realPasswords[1];
+ } else {
+ account.passWord2 = self.password2TextField.text;
+ }
+
+ if ([self.password3TextField.text isEqualToString:DUMMY_PASSWD]) {
+ account.passWord3 = _realPasswords[2];
+ } else {
+ account.passWord3 = self.password3TextField.text;
+ }
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ account.deviceName =[NSString stringWithFormat:@"%@|Apple;%@;iOS %@", devInfo.name, devInfo.platformString, devInfo.systemVersion];
+
+ return account;
+}
+
+//Get all cells for the given method
+- (NSArray *)cellsForMethodIndex:(NSUInteger)index {
+ NSArray *methods = [self allAAAMethods];
+ if (methods == nil || methods.count == 0) {
+ ANError(@"No method found for login.");
+ return nil;
+ }
+
+ AAAMethod *method = [methods objectAtIndex:index];
+ if (method == nil) {
+ return nil;
+ }
+
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+
+ for (InputField *field in method.inputFields) {
+ UITableViewCell *cell = [self cellForInputField:field];
+ if (cell == nil) {
+ ANError(@"Unknow inputField type %d", field.type);
+ continue;
+ }
+
+ if (field.type == FieldTypeUsernameText) {
+ // Make sure Username is above password
+ [cells insertObject:cell atIndex:0];
+ } else {
+ [cells addObject:cell];
+ }
+ }
+
+ NSString *infoDesc;
+ if (_isMultiMethods) {
+ //Display the method names
+ UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:methodCellID];
+ [self initMethodMenuWithCell:cell];
+ _methodMenu.titleLabel = (UILabel *)[cell viewWithTag:1];
+ NSArray *pasedMethodDesc = [self parseMethodDesc:method.methodDescription];
+ if (pasedMethodDesc.count > 0) {
+ infoDesc = [pasedMethodDesc objectAtIndex:0];
+ } else {
+ infoDesc = method.methodDescription;
+ }
+ _methodMenu.titleLabel.text = infoDesc;
+ //Method cell shoud be at the top.
+ if (cell != nil) {
+ [cells insertObject:cell atIndex:0];
+ }
+ }
+
+ return cells;
+}
+
+// Create a cell for the inputed field.
+- (UITableViewCell *)cellForInputField:(InputField *)field {
+ UITableViewCell *cell = nil;
+
+ Gateway *gateway = [self currentGateway];
+
+ NSString *username = self.model.account.userName;
+ if (!username || username.length == 0) {
+ username = gateway.username;
+ }
+
+ NSString *passwd;
+
+ switch (field.type) {
+ case FieldTypeUsernameText: {
+ //username field
+ cell = [self.tableView dequeueReusableCellWithIdentifier:usernameCellID];
+ self.usernameTextField = (UITextField *)[cell viewWithTag:TEXTFIELD_TAG_ON_USERNAME_CELL];
+ if (field.inputString) {
+ self.usernameTextField.text = field.inputString;
+ } else {
+ self.usernameTextField.text = username;
+ }
+ break;
+ }
+ case FieldTypePasswordText: {
+ switch (field.passwordIndex) {
+ case INDEX_PASSWORD1: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password1TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password1TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password1TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD2: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password2TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password2TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[1];
+ if (passwd.length > 0) {
+ self.password2TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ case INDEX_PASSWORD3: {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:passwordCellID];
+ self.password3TextField = (UITextField *) [cell viewWithTag:TEXTFIELD_TAG_ON_PASSWORD_CELL];
+ self.password3TextField.placeholder = [NSString stringWithFormat:@"%@(%@)", NSLocalizedString(@"Password", nil), field.fieldDescription ?: @""];
+
+ passwd = _realPasswords[0];
+ if (passwd.length > 0) {
+ self.password3TextField.text = DUMMY_PASSWD;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ return cell;
+}
+
+- (Gateway *)currentGateway {
+ NSString *url = self.model.account.vsURL;
+ NSString *port = self.model.account.vsPort;
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:url andport:port];
+
+ return gateway;
+}
+
+- (void)getSavedPassword {
+ Gateway *gateway = [self currentGateway];
+ NSString *username = gateway.username;
+
+ _realPasswords = @[@"", @"", @""];
+ if (username != nil) {
+ if (!gateway.lastAccessedDate) { // Prevent from getting saved password after reinstall.
+ [PasswordManager removePasswordsOfHost:gateway.host username:username port:gateway.port];
+ }
+
+ if (gateway.isSavePasswordEnabled) {
+ _realPasswords = [PasswordManager passwordsOfHost:gateway.host username:username port:gateway.port];
+ } else {
+ ANDebug(@"delete user \"%@\" password", username?username:@"nil");
+
+ if (!gateway.isFaceOrTouchIDEnabled && !gateway.isGestureEnabled){
+
+ [self deleteMethodName];
+ [self.model.account deleteAllPasswords];
+ }
+ }
+ }
+}
+
+- (void)tryToAutoLogin {
+ Gateway *gateway = [self currentGateway];
+ BOOL showLoginDialog = gateway.isShowLoginDialogEnabled;
+
+ if (gateway.isSavePasswordEnabled) {
+ if (!showLoginDialog && (_currentTableCells.count == 1 || ![_realPasswords isEqual:@[@"", @"", @""]])) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self login];
+ });
+ }
+ }
+}
+
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return LOGIN_TABLE_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ NSInteger totalCells = _currentTableCells.count;
+ [self updateTableViewHeightWithCellsNumber:totalCells];
+ return _currentTableCells.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return _currentTableCells[indexPath.row];
+}
+
+- (void)updateTableViewHeightWithCellsNumber:(NSInteger)cells {
+ self.tableViewHeightConstraint.constant = cells * TABLEVIEW_CELL_HEIGHT + TABLEVIEW_CELL_PADDING;
+}
+
+#pragma mark - SyferLock switch
+- (BOOL)isSyferLockEnabled {
+ Gateway *gateway = [self currentGateway];
+ if (!gateway) {
+ ANInfo(@"Current gateway is nil, no syferlock can be enabled.");
+ return NO;
+ } else {
+ return gateway.isSyferLockEnabled;
+ }
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+
+ if (@available(iOS 15.0, *)){
+
+ return 0.1;
+ }
+
+ return TABLEVIEW_HEADER_HEIGHT;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return TABLEVIEW_FOOTER_HEIGHT;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ if (indexPath.section == 0 && indexPath.row == kLoginCellMethodIndex && _isMultiMethods) { // Deal with method drop-down menu.
+ [_methodMenu showMenuOnView:self.view];
+ }
+}
+
+- (BOOL)checkPasswordFieldWithPasswordCount:(NSInteger)count {
+ enum PasswordCount {
+ kPasswordOne = 1,
+ kPasswordTwo = 2,
+ kPasswordThree = 3
+ };
+
+ BOOL result = YES;
+
+ switch (count) {
+ case kPasswordOne:
+ if ([self.password1TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordTwo:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ case kPasswordThree:
+ if ([self.password1TextField.text isEqualToString:@""] ||
+ [self.password2TextField.text isEqualToString:@""] ||
+ [self.password3TextField.text isEqualToString:@""]) {
+ result = NO;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!result) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"Login failed, please check username and password",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+
+ return result;
+}
+
+- (void)initMethodMenuWithCell:(UITableViewCell *)cell {
+ if (!_methodMenu) {
+ _methodMenu = [[DropMenuView alloc] initWithOrigin:CGPointMake(0, cell.frame.size.height+TABLEVIEW_HEADER_HEIGHT)];
+ _methodMenu.delegate = self;
+ _methodMenu.dataSource = self;
+ _methodMenu.transformImageView = [cell viewWithTag:IMAGE_VIEW_TAG_ON_METHOD_CELL];
+ _methodMenu.titleLabel = nil;
+ }
+
+ [_methodMenu reloadData];
+}
+
+#pragma mark menuDelegate
+
+- (NSMutableArray *)menu_filterDataArray {
+ NSMutableArray *array = nil;
+ NSArray *descs = self.allMethodDescs;
+ NSString *methodDesc;
+
+ NSInteger index = -1;
+ array = [NSMutableArray arrayWithCapacity:descs.count];
+ for (NSString *desc in descs) {
+ ++index;
+ methodDesc = desc;
+ NSArray *pasedMethodDesc = [self parseMethodDesc:desc];
+ if (pasedMethodDesc.count > 0) {
+ methodDesc = [pasedMethodDesc objectAtIndex:0];
+ }
+
+ FilterTypeModel *model = [[FilterTypeModel alloc] initWithName:methodDesc andId:[NSString stringWithFormat:@"%zi", index]];
+ [array addObject:model];
+ }
+
+ return array;
+}
+
+- (void)menu:(DropMenuView *)menu tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ self.currentMethodIndex = indexPath.row;
+
+ [self.tableView reloadData];
+}
+
+//VPN notifications handler
+- (void)handleVPNNotification:(NSNotification *)notification {
+ VPNMessage *message = notification.object;
+ AAAManager *manager = [AAAManager sharedInstance];
+ NSInteger error = manager.errorCode;
+ NSString *aMessage;
+ BOOL showAlert = YES;
+
+ switch (message.code) {
+ case VPN_CB_CONNECTED: {
+ if (!_isSMX) {
+ // Save passwords for non-SMX login.
+ [self savePasswordsOfAccount:manager.account];
+ }
+ [self finishLogin:YES];
+ break;
+ }
+ case VPN_CB_DISCONNECTING: {
+ [self finishLogin:NO];
+ break;
+ }
+ case VPN_CB_DEVID_REG: {
+ if (!_isSMX) {
+ // Save the current account
+ // In SMX, the account has been saved.
+ _account = [manager.account copy];
+ } else {
+ // SMX, clean the saved password, since it is useless after register.
+ manager.account.passWord = nil;
+ }
+
+ [self performSegueWithIdentifier:kSegueToRegister sender:nil];
+ break;
+ }
+ case VPN_CB_CHALLENGE: {
+ [self performSegueWithIdentifier:kSegueToChallenge sender:nil];
+ break;
+ }
+ case VPN_CB_CONN_FAILED: {
+ switch (error) {
+ case ERR_DEVID_APPROVE_PENDING:
+ aMessage = NSLocalizedString(@"Your device is registering, please request manager approval",nil);
+ break;
+ case ERR_DEVID_APPROVE_DENY:
+ aMessage = NSLocalizedString(@"Register device deny, not allow register device auto approve",nil);
+ break;
+ case ERR_DEVID_USER_LIMIT:
+ aMessage = NSLocalizedString(@"User for this device has reached his or her limit",nil);
+ break;
+ case ERR_DEVID_DEV_LIMIT:
+ aMessage = NSLocalizedString(@"Device has reached its limit",nil);
+ break;
+ case ERR_WRONG_USER_PASS:
+ if (!_isSyferLock) { // DON'T remove saved password if SyferLock is enabled.
+ [self deleteMethodName];
+ [manager.account deleteAllPasswords];
+ }
+ aMessage = manager.errorInformation;
+ //aMessage = NSLocalizedString(@"Login failed, please check username and password",nil);
+ break;
+ case ERR_AUTHORIZE_FAILED:
+ aMessage = NSLocalizedString(@"Login failed", nil);
+ break;
+ case ERR_CALLBACK_FAILED:
+ break;
+ case ERR_INTERRUPTED:
+ break;
+ case ERR_CLIENT_SECURITY:
+ aMessage = NSLocalizedString(@"Client security is not supported", nil);
+ break;
+ case ERR_CERT_NO:
+ aMessage = NSLocalizedString(@"Client certificate not supply", nil);
+ break;
+ case ERR_CERT_INVALID_SIGNTURE:
+ aMessage = NSLocalizedString(@"Client certificate invalid signture", nil);
+ break;
+ case ERR_CERT_UNTRUSTED:
+ aMessage = NSLocalizedString(@"Client certificate untrusted", nil);
+ break;
+ case ERR_CERT_EXPIRED:
+ aMessage = NSLocalizedString(@"Client certificate expired", nil);
+ break;
+ case ERR_CERT_INVALID:
+ aMessage = NSLocalizedString(@"Client certificate invalid", nil);
+ break;
+ case ERR_CERT_REVOKED:
+ aMessage = NSLocalizedString(@"Client certificate revoked", nil);
+ break;
+ case ERR_SMS_GET_PHONE:
+ aMessage = NSLocalizedString(@"The system failed to get your phone number to do OTP authentication", nil);
+ break;
+ case ERR_SMS_SEND:
+ aMessage = NSLocalizedString(@"The system failed to send message to your phone", nil);
+ break;
+ case ERR_SMS_TOO_MANY_RETRY:
+ aMessage = NSLocalizedString(@"Your attempt to sign in failed, because you have entered wrong SMS verification code for too many times", nil);
+ break;
+ case ERR_HWID_DENY:
+ aMessage = NSLocalizedString(@"The device is denied because of wrong hardware ID!", nil);
+ break;
+ case ERR_HWID_PENDING:
+ aMessage = NSLocalizedString(@"The hardware ID of this device is not approved yet!", nil);
+ break;
+ default:
+ ANError(@"Login failed with error message: %@", aMessage);
+ break;
+ }
+
+ // Try to show error message, only valid on viewcontroller still exists.
+ if (![self currentGateway].isShowLoginDialogEnabled) {
+ if (aMessage && aMessage.length > 0) {
+ if (![aMessage containsString:@""].location];
+ ANInfo(@"Connect failed:Display message=%@", displayMessage);
+
+ NSString *URLMessage = [aMessage substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ }
+ cancelAction:nil];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+ }
+ }
+
+ break;
+ }
+ case VPN_CB_LOGIN:
+ case VPN_CB_SYFERLOCK_AUTH: {
+ if (error == ERR_WRONG_USER_PASS || error == ERR_USER_LOCKED) {
+ __weak typeof(self) weakSelf = self;
+ if (![manager.errorInformation containsString:@""].location];
+ ANInfo(@"Display message=%@", displayMessage);
+
+ NSString *URLMessage = [manager.errorInformation substringFromIndex:(subStrRange.location + subStrRange.length)];
+ URLMessage = [URLMessage substringToIndex:[URLMessage rangeOfString:@"'>"].location];
+ ANInfo(@"URL message=%@", URLMessage);
+
+ PopupDialog *popup = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil) message:displayMessage confirmAction:^{
+ NSURL *url = [NSURL URLWithString:URLMessage];
+ OpenURL(url);
+ [weakSelf showLoginActivity:NO];
+
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }
+ cancelAction:^{
+ [weakSelf showLoginActivity:NO];
+ // If password is wrong, pop to root view.
+ [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+ }];
+ [self presentViewController:popup animated:YES completion:nil];
+ }
+
+ if (!_isSyferLock) {
+ [self removePasswordsOfAccount:manager.account];
+ }
+
+ ANError(@"Error message: %@", manager.errorInformation);
+ } else if (error == ERR_AUTHORIZE_FAILED) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Authorize failed",nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [self removePasswordsOfAccount:manager.account];
+ } else if (error == ERR_SUCCESS) {
+ //After register, we need to login again. Using the account we have saved.
+ if (!_account) {
+ _account = [AAAManager sharedInstance].account;
+ }
+ [manager continueVPNThreadWithAccount:_account];
+
+ break;
+ }
+ break;
+ }
+ case VPN_CB_SMX: {
+ _isSMX = YES;
+
+ // Save password(s) for multi-step auth.
+ [self savePasswordsOfAccount:manager.account];
+ // Save current account, and use it to login after registering.
+ _account = [manager.account copy];
+
+ // Clean passwords
+ _account.passWord = nil;
+
+ ANDebug(@"message.code VPN_CB_SMX %zi", error);
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info != NULL) {
+ ANDebug(@"smx_info->action: %d", smx_info->action);
+ switch (smx_info->action) {
+ case SMX_ACTION_INPUT_PASS:
+ case SMX_ACTION_INPUT_OLD_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_LOGIN]) {
+ //If the top controller is login controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMX sender:nil];
+ showAlert = NO;
+ }
+ break;
+ case SMX_ACTION_INPUT_NEW_PASS:
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_NEWPASS]) {
+ //If the top controller is new password controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ break;
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMXChangePassword sender:nil];
+ showAlert = NO;
+ }
+ break;
+
+ case SMX_ACTION_PASS_CONFIRM:
+ [self performSegueWithIdentifier:kSegueToSMXConfirmPassword sender:nil];
+ showAlert = NO;
+ break;
+
+ default:
+ break;
+ }
+
+ if (showAlert && smx_info->errmsg[0] != '\0') {
+ NSString *errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:errorMessage];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+ }
+ break;
+ }
+ case VPN_CB_VDI_AUTH: {
+ [self handleVDIAuth];
+ break;
+ }
+ case VPN_CB_SMS: {
+ if ([self.navigationController.topViewController isKindOfClass:[SMSViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSMS sender:nil];
+ }
+ break;
+ }
+ case VPN_CB_CHANGPASSWORD: {
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:nil];
+ break;
+ }
+ case VPN_CB_SYFERLOCK_LOGIN: {
+ _isSyferLock = YES;
+ if ([self.navigationController.topViewController isKindOfClass:[SyferLockLoginViewController class]]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToSyferLock sender:nil];
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+- (void)refreshTopView {
+ UIViewController *top = [self.navigationController topViewController];
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([top respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [top performSelector:handler];
+ }
+}
+
+// If last login method contains SMX.
+- (BOOL)isSMXAuth {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ VPNAccount *account = _account;
+ if (!account) {
+ account = manager.account;
+ }
+
+ NSString *currentMethod = account.loginMethod;
+
+ NSArray *methods = [self allAAAMethods];
+ for (AAAMethod *method in methods) {
+ if ([method.name isEqualToString:currentMethod]) {
+ return method.isSmx;
+ }
+ }
+
+ return NO;
+}
+
+- (NSString *)loginFailedMessage:(NSInteger)errorCode {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if ([self isSMXAuth]) {
+ // Get error message for SMX auth
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info && strlen(smx_info->errmsg) != 0 && [self isValidSMXAction]) {
+ errorMessage = [NSString stringWithUTF8String:smx_info->errmsg];
+ if (errorMessage && ![errorMessage isEqualToString:@"OK"]) {
+ return errorMessage;
+ }
+ }
+ }
+
+ if (errorCode == ERR_USER_LOCKED) {
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+ }
+
+ NSString *errorMessage = manager.errorInformation;
+ if (errorMessage && errorMessage.length > 0) {
+ return errorMessage;
+ }
+
+ // Return this string for all login error (incorrect username or password) except SMX auth.
+ return NSLocalizedString(@"Login failed, please check username and password", nil);
+}
+
+- (BOOL)isValidSMXAction {
+ vpn_smx_info_t *smx_info = [AAAManager sharedInstance].smx_info;
+
+ return (smx_info->action >= SMX_ACTION_UNKNOWN && smx_info->action <= SMX_ACTION_PASS_CONFIRM);
+}
+
+- (void)handleVDIAuth {
+ __weak typeof(self) weakSelf = self;
+ self.alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"VDI Credential", nil)
+ message:NSLocalizedString(@"Please input username and password", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+ style:UIAlertActionStyleCancel
+ handler:^(UIAlertAction * _Nonnull action) {
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = nil;
+ account.passWord = nil;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+ UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * _Nonnull action) {
+ NSString *username = weakSelf.alertController.textFields[0].text; // Username text field
+ NSString *password = weakSelf.alertController.textFields[1].text; // Password text field
+ username = [username stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.userName = username;
+ account.passWord = password;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithVDIAccount:account];
+ }];
+
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Username", nil);
+ }];
+ [self.alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+ textField.placeholder = NSLocalizedString(@"Password", nil);
+ }];
+ [self.alertController addAction:confirmAction];
+ [self.alertController addAction:cancelAction];
+
+ [self presentViewController:self.alertController animated:YES completion:nil];
+}
+
+- (void)finishLogin:(BOOL)success {
+ self.alertController = nil;
+
+ __weak typeof(self) weakSelf = self;
+ [self dismissViewControllerAnimated:YES completion:^{
+ [weakSelf.delegate didFinishLogin:success];
+ }];
+}
+
+#pragma mark - Passwords
+- (void)savePasswordsOfAccount:(VPNAccount *)account {
+ Gateway *gateway = [self currentGateway];
+ if (![account.userName isEqualToString:gateway.username]){
+
+ gateway.username = account.userName;
+ [[[GatewayManager alloc] init] updateGateway:gateway];
+ }
+
+ if (account.userName){
+
+ [self saveMethodName];
+ [self savePassWord:account];
+ return;
+ }
+
+ if (gateway.username) { // Only remember password when username is configured.
+
+ [self savePassWord:account];
+ } else {
+ ANDebug(@"Password will be deleted, because the login user is different from the one in settings.");
+
+ [self deleteMethodName];
+ [account deleteAllPasswords];
+ }
+}
+
+-(void) savePassWord: (VPNAccount *) account
+{
+ NSMutableArray *passwords = [[NSMutableArray alloc] init];
+ if (account.passWord) {
+ [passwords addObject:[account.passWord copy]];
+ }
+
+ Gateway *gateway = [self currentGateway];
+
+ if (![self isRadiusSavePass:account.loginMethod]){
+
+ gateway.isRadiusPWD = NO;
+ if (account.passWord2) {
+ [passwords addObject:[account.passWord2 copy]];
+ }
+ if (account.passWord3) {
+ [passwords addObject:[account.passWord3 copy]];
+ }
+ }else{
+
+ gateway.isRadiusPWD = YES;
+ }
+
+ [PasswordManager savePasswords:passwords forHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+-(BOOL) isRadiusSavePass: (NSString *) methodName
+{
+ if (self.allMethodDescs.count < 1 || ISNULLSTR(methodName)){
+
+ return NO;
+ }
+
+ NSInteger acount = [self.allMethodNames indexOfObject:methodName];
+
+ if (acount < 0){
+
+ return NO;
+ }
+
+ NSString *methodDesc = [_allMethodDescs objectAtIndex:acount];
+ if ([methodDesc rangeOfString:RADIUS_SAVE_PWD].location != NSNotFound){
+
+ ANInfo(@"LoginView-isRadiusSavePass- did not save pwd");
+ return YES;
+ }
+
+ return NO;
+}
+
+-(void) saveMethodName
+{
+ NSString *methodName = self.currentMethod ?: (_methodMenu.titleLabel.text ?: @"");
+ NSString *userName = _usernameTextField.text ?: @"";
+ if ([methodName isEqualToString:@""]){
+
+ methodName = @"ldb";
+ }
+
+ NSString *methodType = [Singleton sharedSingleton].isSupportAuth ? @"0" : @"1";
+ NSDictionary *verifyDic = @{@"methodName" : methodName, @"userName" : userName, @"methodType" : methodType};
+ [Singleton setCurrentGatewayMethod:verifyDic andKey:self.gateWay];
+}
+
+-(void) getCurrentMethod
+{
+ auth_type_t type = self.currentMethodType;
+ if (type == AUTH_LOCALDB || type == AUTH_LDAP || type == AUTH_RADIUS || type == AUTH_RADIUS_ACCOUNT ||
+ type == AUTH_DEVID || type == AUTH_HTTP || type == AUTH_CERTIFICATE){
+
+ [Singleton sharedSingleton].isSupportAuth = YES;
+ }else{
+
+ [Singleton sharedSingleton].isSupportAuth = NO;
+ }
+
+ if (type == AUTH_CERTIFICATE){
+
+ _usernameTextField.text = @"";
+ }
+}
+
+-(void) deleteMethodName
+{
+ [Singleton setCurrentGatewayMethod:@{} andKey:self.gateWay];
+}
+
+- (void)removePasswordsOfAccount:(VPNAccount *)account {
+ [PasswordManager removePasswordsOfHost:account.vsHost username:account.userName port:account.vsPort];
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if (textField == self.usernameTextField) {
+ [self.usernameTextField resignFirstResponder];
+ if (_currentTableCells.count > 1) {
+ [self.password1TextField becomeFirstResponder];
+ }
+ }
+
+ return YES;
+}
+
+#pragma mark - ANViewControllerSwitchProtocol
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option {
+ if (sender) {
+ self.delegate = sender;
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RegisterViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RegisterViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RegisterViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// RegisterViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/18.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface RegisterViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RegisterViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RegisterViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RegisterViewController.m (working copy)
@@ -0,0 +1,214 @@
+//
+// RegisterViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/18.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "ANPopupDialog.h"
+#import "GatewayManager.h"
+#import "InformationToSave.h"
+#import "PasswordManager.h"
+#import "UIDevice+Hardware.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "RegisterViewController.h"
+
+#define DUMMY_PASSWORD @"##&&**"
+
+#define TOTAL_SECTIONS 1
+#define TOTAL_ROWS 3
+
+static NSInteger kTextFieldTag = 1;
+
+static NSString * const kUsernameCellID = @"RegisterUsernameCell";
+static NSString * const kPasswordCellID = @"RegisterPasswordCell";
+static NSString * const kDeviceNameCellID = @"RegisterDeviceNameCell";
+
+typedef NS_ENUM(NSInteger, RegisterTableIndex) {
+ kRegisterTableUsername = 0,
+ kRegisterTablePassword,
+ kRegisterTableDeviceName,
+};
+
+@interface RegisterViewController () {
+ UITextField *_usernameTextField;
+ UITextField *_passwordTextField;
+ UITextField *_deviceNameTextField;
+ NSString *_realPassword;
+}
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *registerButton;
+
+@end
+
+@implementation RegisterViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+ [self initButtonAppearance];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)initButtonAppearance {
+ self.registerButton.layer.cornerRadius = 2.5;
+ self.registerButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.registerButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.registerButton.layer.shadowOpacity = 0.25;
+}
+
+- (IBAction)registerButtonClicked:(id)sender {
+ [self login];
+}
+
+- (IBAction)cancelButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+- (UITextField *)textFieldWithCell:(UITableViewCell *)cell {
+ return (UITextField *)[cell viewWithTag:kTextFieldTag];
+}
+
+- (void)login {
+ ANDebug(@"Start to register...");
+
+ [self.view endEditing:YES];
+
+ VPNAccount *account = [self inputAccount];
+ if (account == nil) {
+ ANWarn(@"Cannot get account information on register.");
+ return;
+ }
+
+ ANInfo(@"VPN account on register: %@", account);
+
+ InformationToSave *infor = [InformationToSave sharedInstance];
+ infor.lastLoginAccount = account;
+ [infor save];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ manager.errorCode = ERR_SUCCESS;
+ [manager continueVPNThreadWithAccount:account];
+
+ [self showLoginActivity:YES];
+}
+
+- (VPNAccount *)inputAccount {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+
+ NSString *username = [_usernameTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+ NSString *password = [_passwordTextField.text isEqualToString:DUMMY_PASSWORD] ? _realPassword : _passwordTextField.text;
+
+ NSString *devName = [_deviceNameTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+ if (devName == nil || devName.length == 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"Device name couldn`t be empty", nil)];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return nil;
+ }
+
+ UIDevice *devInfo = [UIDevice currentDevice];
+ NSString *longDevName = [NSString stringWithFormat:@"%@|Apple;%@;iOS %@", _deviceNameTextField.text,devInfo.platformString,devInfo.systemVersion];
+
+ account.deviceName = longDevName;
+ if (account.deviceName.length > 64) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"The valid length of device's name is 1-64!", nil)];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return nil;
+ }
+
+ account.userName = username;
+ account.passWord = password;
+
+ return account;
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ NSString *cellID = nil;
+ UITableViewCell *cell = nil;
+ NSInteger row = indexPath.row;
+ VPNAccount *account = [AAAManager sharedInstance].account;
+
+ switch (row) {
+ case kRegisterTableUsername:{
+ cellID = kUsernameCellID;
+ cell = [self.tableView dequeueReusableCellWithIdentifier:cellID];
+ _usernameTextField = [self textFieldWithCell:cell];
+ _usernameTextField.text = account.userName;
+ break;
+ }
+ case kRegisterTablePassword: {
+ cellID = kPasswordCellID;
+ cell = [self.tableView dequeueReusableCellWithIdentifier:cellID];
+
+ _passwordTextField = [self textFieldWithCell:cell];
+
+ // Auto fill the first password field.
+ _realPassword = [AAAManager sharedInstance].account.passWord;
+
+ if (!_realPassword || _realPassword.length == 0) {
+ Gateway *gateway = [[GatewayManager sharedInstance] gatewayOfUrl:account.vsURL andport:account.vsPort];
+ NSString *username = gateway.username;
+ if (username) {
+ _realPassword = [PasswordManager passwordsOfHost:account.vsHost username:username port:account.vsPort][0];
+ } else {
+ _realPassword = @"";
+ }
+ }
+
+ if (_realPassword && _realPassword.length > 0) {
+ _passwordTextField.text = DUMMY_PASSWORD;
+ }
+ break;
+ }
+ case kRegisterTableDeviceName: {
+ cellID = kDeviceNameCellID;
+ cell = [self.tableView dequeueReusableCellWithIdentifier:cellID];
+ _deviceNameTextField = [self textFieldWithCell:cell];
+ _deviceNameTextField.text = [UIDevice currentDevice].name; // Set system device name as default.
+ break;
+ }
+ default:
+ ANError(@"Invalid cell row of (%zi) received.", row);
+ return [[UITableViewCell alloc] init]; // Prevent from crash.
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15.0;
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RemoteDesktopSettingsViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RemoteDesktopSettingsViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RemoteDesktopSettingsViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// RemoteDesktopSettingsViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/9/6.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface RemoteDesktopSettingsViewController : UITableViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RemoteDesktopSettingsViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RemoteDesktopSettingsViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/RemoteDesktopSettingsViewController.m (working copy)
@@ -0,0 +1,182 @@
+//
+// RemoteDesktopSettingsViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/9/6.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "ActionSheetPicker.h"
+#import "RemoteDesktopSettingsViewController.h"
+
+#define TOTAL_SECTIONS 2
+#define TOTAL_ROWS 1
+
+#define AUDIO_MODE_MIN 0
+#define AUDIO_MODE_MAX 3
+#define VENDOR_MIN 0
+#define VENDOR_MAX 2
+
+typedef NS_ENUM(NSInteger, RDSettingSectionIndex) {
+ kRDSettingSectionIndexAudioMode,
+ kRDSettingSectionIndexVendor
+};
+
+static NSInteger const kRDSettingsRowIndex = 0;
+
+static NSString * const DESKTOP_AUDIO_KEY = @"desktop_audio_mode";
+static NSString * const DESKTOP_CLIENT_VENDOR = @"desktop_client_vendor";
+
+@interface RemoteDesktopSettingsViewController ()
+
+@property (weak, nonatomic) IBOutlet UILabel *audioModeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *vendorLabel;
+@property (weak, nonatomic) IBOutlet UITableViewCell *audioModelCell;
+@property (weak, nonatomic) IBOutlet UITableViewCell *vendorCell;
+
+@property (nonatomic) NSInteger audioMode;
+@property (nonatomic) NSInteger vendorIndex;
+
+@end
+
+@implementation RemoteDesktopSettingsViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self configAudioModeLabel];
+ [self configVenderLabel];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+}
+
+- (NSInteger)audioMode {
+ NSInteger mode = [[NSUserDefaults standardUserDefaults] integerForKey:DESKTOP_AUDIO_KEY];
+ if (mode >= AUDIO_MODE_MAX || mode < AUDIO_MODE_MIN) {
+ mode = AUDIO_MODE_MIN;
+ [[NSUserDefaults standardUserDefaults] setInteger:mode forKey:DESKTOP_AUDIO_KEY];
+ }
+
+ return mode;
+}
+
+- (void)setAudioMode:(NSInteger)audioMode {
+ if (audioMode >= AUDIO_MODE_MAX || audioMode < AUDIO_MODE_MIN) {
+ return;
+ }
+
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ [userDefaults setInteger:audioMode forKey:DESKTOP_AUDIO_KEY];
+ [userDefaults synchronize];
+}
+
+- (NSInteger)vendorIndex {
+ NSInteger mode = [[NSUserDefaults standardUserDefaults] integerForKey:DESKTOP_CLIENT_VENDOR];
+ if (mode >= VENDOR_MAX || mode < VENDOR_MIN) {
+ mode = VENDOR_MIN;
+ [[NSUserDefaults standardUserDefaults] setInteger:mode forKey:DESKTOP_CLIENT_VENDOR];
+ }
+
+ return mode;
+}
+
+- (void)setVendorIndex:(NSInteger)vendorIndex {
+ if (vendorIndex >= VENDOR_MAX || vendorIndex < VENDOR_MIN) {
+ return;
+ }
+
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ [userDefaults setInteger:vendorIndex forKey:DESKTOP_CLIENT_VENDOR];
+ [userDefaults synchronize];
+}
+
+- (NSString *)audioModeString {
+ return @[NSLocalizedString(@"Local", nil), NSLocalizedString(@"Remote", nil), NSLocalizedString(@"Mute", nil)][self.audioMode];
+}
+
+- (NSString *)venderString {
+ return @[@"MS RDP", @"JP-RDP"][self.vendorIndex];
+}
+
+- (void)configAudioModeLabel {
+ self.audioModeLabel.text = [self audioModeString];
+}
+
+- (void)configVenderLabel {
+ self.vendorLabel.text = [self venderString];
+}
+
+- (void)showAllAudioModes {
+ NSString *local = NSLocalizedString(@"Play sounds on the local device", nil);
+ NSString *remote = NSLocalizedString(@"Play sounds on the remote computer", nil);
+ NSString *mute = NSLocalizedString(@"Do not play sounds", nil);
+
+ __weak typeof(self) weakSelf = self;
+ [ActionSheetStringPicker showPickerWithTitle:nil
+ rows:@[local, remote, mute]
+ initialSelection:0
+ doneBlock:^(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue) {
+ weakSelf.audioMode = selectedIndex;
+ [weakSelf configAudioModeLabel];
+ }
+ cancelBlock:^(ActionSheetStringPicker *picker) {
+
+ }
+ origin:self.audioModelCell];
+}
+
+- (void)showAllVenders {
+ NSString *vendorMSRDP = NSLocalizedString(@"MS RDP", nil);
+ NSString *vendorNEC = NSLocalizedString(@"JP-RDP", nil);
+
+ __weak typeof(self) weakSelf = self;
+ [ActionSheetStringPicker showPickerWithTitle:nil
+ rows:@[vendorMSRDP, vendorNEC]
+ initialSelection:0
+ doneBlock:^(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue) {
+ weakSelf.vendorIndex = selectedIndex;
+ [weakSelf configVenderLabel];
+ }
+ cancelBlock:^(ActionSheetStringPicker *picker) {
+
+ }
+ origin:self.vendorCell];
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger section = indexPath.section;
+ NSInteger row = indexPath.row;
+
+ if (row == kRDSettingsRowIndex) {
+ if (section == kRDSettingSectionIndexAudioMode) {
+ [self showAllAudioModes];
+ } else if (section == kRDSettingSectionIndexVendor) {
+ [self showAllVenders];
+ }
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// ResourcesViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface ResourcesViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m (working copy)
@@ -0,0 +1,1306 @@
+//
+// ResourcesViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "PubAppItem.h"
+#import "FBKVOController.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "GatewayManager.h"
+#import "CertificateManager.h"
+#import "ConfigurationManager.h"
+#import "RulesManager.h"
+#import "ResourceCell.h"
+#import "MJRefresh.h"
+#import "NativeAppCell.h"
+#import "AutoLoginHandler.h"
+#import "SubResourceViewController.h"
+#import "UIView+Toast.h"
+#import "ResourcesViewController.h"
+#import "AccessModeCell.h"
+#import "AccessModeSelectViewController.h"
+#import "ZTWKWebViewController.h"
+
+static NSString * const kSegueToSubResource = @"ResourceToSubResource";
+static NSString * const kSegueToCustomDesktop = @"ResourceToCustomDesktop";
+static NSString * const kSegueToAccessModeSelect = @"ResourceToAccessModeSelect";
+
+NSString * const kAppGroupNameResource = @"group.net.arraynetworks.MotionProPlus";
+NSString * const kArrayVPNTunelErrorMsgResource = @"net.arraynetworks.sslvpn.errormsg";
+
+typedef NS_ENUM(NSInteger, ResourceSectionNumber) {
+ kResourceSectionZero = 0,
+ kResourceSectionOne,
+ kResourceSectionTwo,
+ kResourceSectionThree
+};
+
+typedef NS_ENUM(NSInteger, ResourceSectionIndex) {
+ kResourceSectionIndex0 = 0,
+ kResourceSectionIndex1,
+ kResourceSectionIndex2
+};
+
+@interface ResourcesViewController () {
+ NSInteger _longPressedIndex;
+}
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+@property (weak, nonatomic) IBOutlet UISwitch *vpnEnableSwitch;
+@property (weak, nonatomic) IBOutlet UIImageView *statusImageView;
+
+@property (weak, nonatomic) IBOutlet UIView *messageView;
+@property (weak, nonatomic) IBOutlet UILabel *messageLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *emptyResourceView;
+@property (weak, nonatomic) IBOutlet UIImageView *emptyResourceImageView;
+@property (weak, nonatomic) IBOutlet UILabel *emptyResourceLabel;
+
+@property (weak, nonatomic) IBOutlet UITableView *resourceTableView;
+
+@property (weak, nonatomic) IBOutlet UITableView *acsModeTableView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *resourceViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *emptyViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageViewTopConstraint;
+
+@property (strong, nonatomic) AppManager *model;
+@property (strong, nonatomic) NSArray *desktops; // As a cache
+
+@property (strong, nonatomic) NSArray *acsDescList;
+@property (strong, nonatomic) NSArray *acsNameList;
+@property (strong, nonatomic) NSString *acsSelectedInfo;
+
+
+@property (strong, nonatomic) id browser;
+
+// For DesktopDirect
+@property (nonatomic, strong) NSIndexPath *currentIndex;
+@property (nonatomic, strong) ResourceItem *currentItem;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic) BOOL silence;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation ResourcesViewController
+
+@synthesize desktops = _desktops;
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgResource object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [AppManager sharedInstance];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleAutoLogout:)
+ name:kAutoLogoutNotification
+ object:nil];
+
+ [self setVPNStatusAsDisconnected];
+ [self autoStartVPN];
+ [self doPostLoginCV];
+
+ [self initKVOController];
+
+ [self initTopView];
+ [self initAccessModeView];
+ [self initPullToRefresh];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+
+ self.silence = YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.silence = NO;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+
+ RulesManager *manager = [RulesManager sharedInstance];
+ if (manager.didEndSession) {
+ manager.didEndSession = NO;
+
+ [self logoutSilently];
+ }
+}
+
+- (void)initAccessModeView {
+ BOOL bShowAcsModeView = NO;
+
+ self.acsSelectedInfo = nil;
+ self.acsDescList = [AAAManager sharedInstance].acsModeDesc;
+ self.acsNameList = [AAAManager sharedInstance].acsModeName;
+ if (self.acsDescList != nil) {
+ bShowAcsModeView = YES;
+ }
+
+ if (bShowAcsModeView) {
+ self.acsModeTableView.hidden = NO;
+ self.resourceViewTopConstraint.constant = 95;
+ self.emptyViewTopConstraint.constant = 100;
+ self.messageViewTopConstraint.constant = 100;
+ self.acsModeTableView.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0,0,0,0.01)];
+ } else {
+ self.acsModeTableView.hidden = YES;
+ self.resourceViewTopConstraint.constant = 45;
+ self.emptyViewTopConstraint.constant = 50;
+ self.messageViewTopConstraint.constant = 50;
+ }
+
+ self.needReconnect = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Would you like to sign out?", nil)
+ confirmAction:^{
+ [weakSelf stopVPNAndLogout:NO];
+ }
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (IBAction)vpnEnableSwitched:(id)sender {
+ if (self.vpnEnableSwitch.on) {
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+ } else {
+ [self stopVPN];
+ }
+}
+
+- (void)initTopView {
+ [self.acsModeTableView registerNib:[UINib nibWithNibName:@"AccessModeCell" bundle:nil] forCellReuseIdentifier:kAccessModeCellID];
+ if (self.model.isEmpty) {
+ [self showEmptyResouceView];
+ } else {
+ [self showResourceTableView];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"ResourceCell" bundle:nil] forCellReuseIdentifier:kResourceCellID];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"NativeAppCell" bundle:nil] forCellReuseIdentifier:kNativeAppCellID];
+ }
+}
+
+- (void)initPullToRefresh {
+ __weak typeof(self) weakSelf = self;
+ self.resourceTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ [strongSelf endRefresh];
+
+ Gateway *currentGateway = [self getCurrentGateway];
+ if (currentGateway) {
+ [[AppManager sharedInstance] fetchAppsFromServer:currentGateway.host
+ port:currentGateway.port
+ completion:^(BOOL isNeedUpdate) {
+ [strongSelf.resourceTableView reloadData];
+ }];
+ }
+ }];
+}
+
+- (void)endRefresh{
+ [self.resourceTableView.mj_header endRefreshing];
+}
+
+- (void)doPostLoginCV {
+ [[RulesManager sharedInstance] setDelegate:self];
+
+ /**
+ * It may not be a reliable way to do post login Client Verification.
+ * Maybe we should listen to the VPN_CB_CV_USER message.
+ */
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ RulesManager *manager = [RulesManager sharedInstance];
+ [manager cleanTimerRuleInteraction];
+ [manager kickoffTimerRules];
+ });
+
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)initKVOController {
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+#pragma mark - Access Mode
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ [cells addObject:[tableView cellForRowAtIndexPath:indexPath]];
+ }
+ }
+ return cells;
+}
+
+- (int)switchAccessMode:(NSString *)acsDesc {
+ int ret = ERROR_ACM_SUCCESS;
+ BOOL isMatchDesc = NO;
+
+ if ([self.acsDescList count] == [self.acsNameList count]) {
+ for (NSUInteger i =0; i < [self.acsDescList count]; i++) {
+ if ([[self.acsDescList objectAtIndex:i] isEqualToString:acsDesc]) {
+ isMatchDesc = YES;
+ ret = array_vpn_access_mode_set([[self.acsNameList objectAtIndex:i] UTF8String], NULL, NULL, 0);
+ break;
+ }
+ }
+ }
+
+ if (!isMatchDesc) {
+ ANError(@"switchAccessMode: get match access mode message failed, switch failed return error.");
+ ret = ERROR_ACM_UNDEFINE;
+ }
+
+ return ret;
+}
+
+- (void)accessModeRestartVPN{
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+}
+
+- (void)didFinishSelect:(NSString *)selectAcsDesc {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ NSString *currentAcsDesc = [cell getCellText];
+ if ([selectAcsDesc length] > 0) {
+ if ([currentAcsDesc isEqualToString:selectAcsDesc]) {
+ ANInfo(@"didFinishSelect: user select same access mode ,do nothing.");
+ } else {
+ ANInfo(@"didFinishSelect: user select access mode[%@]", selectAcsDesc);
+ [cell setCellText:selectAcsDesc];
+ [cell showActiveView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ int ret = [self switchAccessMode:selectAcsDesc];
+ NSString *errorMessage = nil;
+ switch (ret) {
+ case ERROR_ACM_SUCCESS:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ break;
+ case ERROR_ACM_SUCCESS_RECONN:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus == ArrayVPNConnected) {
+ ANInfo(@"didFinishSelect:vpn status is connected, need reconnect.");
+ self.needReconnect = YES;
+ [self stopVPN];
+ } else {
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+ break;
+ case ERROR_ACM_WITHOUT_SESSION:
+ errorMessage = NSLocalizedString(@"Switching failure: invalid user session. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_INVALID:
+ errorMessage = NSLocalizedString(@"Switching failure: illegal mode information. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_NONE:
+ errorMessage = NSLocalizedString(@"Switching failure: mode information does not exist. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_INVALID_PARAMETER:
+ errorMessage = NSLocalizedString(@"Switching failure: incorrect parameter. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_ACL_CHANGE_FAILED:
+ errorMessage = NSLocalizedString(@"Switching failure: the server fails to switch. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NETWORK:
+ errorMessage = NSLocalizedString(@"Switching failure: network error. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_UNDEFINE:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ default:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ }
+ if (errorMessage && errorMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error",nil) message:errorMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ [cell showActiveView:NO];
+ [cell setCellText:currentAcsDesc];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ for (NSString *info in self.acsDescList) {
+ if ([selectAcsDesc isEqualToString:info]) {
+ self.acsSelectedInfo = info;
+ }
+ }
+ }
+ ANInfo(@"didFinishSelect:switch access mode finished, select access mode=%@.", self.acsSelectedInfo);
+ });
+ }
+ }
+ }
+}
+
+#pragma mark - Auto Logout
+- (void)handleAutoLogout:(NSNotification *)notification {
+ [self logoutSilently];
+}
+
+- (void)clearCookies { // ANsession should be cleared on logout. (for WebAuth)
+#define MP_SESSION_PREFIX @"ANsession"
+#define MP_USERNAME_COOKIE @"username"
+#define MP_ACCESS_NAME @"acs_mode"
+#define MP_ACCESS_DESC @"acs_desc"
+
+ NSHTTPCookieStorage *cookieJar = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+ NSArray *cookies = cookieJar.cookies;
+ for (NSHTTPCookie *cookie in cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE] ||[cookie.name containsString:MP_SESSION_PREFIX] || [cookie.name containsString:MP_ACCESS_NAME] || [cookie.name containsString:MP_ACCESS_DESC]) {
+ [cookieJar deleteCookie:cookie];
+ }
+ }
+ }
+}
+
+#pragma mark - VPN Status
+#define STATUS_LABEL_COLOR_NORMAL UIColorFromRGBA(0x666666, 1.0)
+#define STATUS_LABEL_COLOR_WARNING UIColorFromRGBA(0xff0000, 1.0)
+#define STATUS_LABEL_COLOR_GREEN UIColorFromRGBA(0x42a009, 1.0)
+
+- (void)setVPNStatusAsConnecting {
+ self.activityIndicator.hidden = NO;
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Connecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNSStatusAsConnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_GREEN;
+ self.statusLabel.text = NSLocalizedString(@"Connected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectSuccess"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsDisconnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+ if (self.needReconnect) {
+ ANInfo(@"access mode disconnect vpn finished, now need restart vpn.");
+ self.needReconnect = NO;
+ [self accessModeRestartVPN];
+ }
+}
+
+- (void)setVPNStatusAsDisconnecting {
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsError:(NSString *)errorMessage {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_WARNING;
+ self.statusLabel.text = NSLocalizedString(@"Connect failed", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:errorMessage];
+}
+
+- (void)showMessageViewWithInfo:(NSString *)info {
+ if (info) {
+ self.messageLabel.text = info;
+ self.messageView.hidden = NO;
+ } else {
+ self.messageLabel.text = @"";
+ self.messageView.hidden = YES;
+ }
+}
+
+- (void)showEmptyResouceView {
+ self.emptyResourceView.hidden = NO;
+ self.resourceTableView.hidden = YES;
+ [self.view bringSubviewToFront:self.emptyResourceView];
+}
+
+- (void)showResourceTableView {
+ self.emptyResourceView.hidden = YES;
+ self.resourceTableView.hidden = NO;
+ [self.view bringSubviewToFront:self.resourceTableView];
+}
+
+#pragma mark - VPN Related
+- (BOOL)autoStartVPN {
+ BOOL isAutoStart = NO;
+ Gateway *gateway = [self getCurrentGateway];
+
+ if (!gateway) {
+ isAutoStart = YES;
+ ANInfo(@"No gateway is selected, it is auto start vpn.");
+ } else {
+ if (!gateway.isSecureTunnelEnabled) {
+ ANInfo(@"Auto start VPN is not enabled.");
+ return NO;
+ }
+ }
+
+ return [self startVPN:isAutoStart];
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameResource];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [vpnWrapper startSSLVPN];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgResource object:nil];
+
+ return YES;
+
+// if (isAutoStart) {
+// [vpnWrapper startSSLVPN];
+// }
+//
+// return [vpnWrapper validateSessionWithHost:gateway.host
+// port:gateway.port
+// session:session
+// completion:^(BOOL isSuccess, NSError *error) {
+// if (isSuccess) {
+// [vpnWrapper startSSLVPN];
+// } else {
+// NSString *message = NSLocalizedString(@"Session is invalid, please login again!", nil);
+// PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+// message:message
+// action:^{
+// [[NSNotificationCenter defaultCenter]
+// postNotificationName:kAutoLogoutNotification
+// object:nil];
+// }];
+// [self presentViewController:dialog animated:YES completion:nil];
+// }
+// }];
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+- (void)stopVPNAndLogout:(BOOL)isSilent {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{ // Stop timer rules fisrt.
+ [[RulesManager sharedInstance] stopAllRules];
+ });
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager continueVPNThreadWithAccount:nil];
+ [self stopVPN];
+
+ [self clearCookies];
+
+ if (!isSilent) {
+ __weak typeof(self) weakSelf = self;
+ [self.view makeToastActivity:CSToastPositionCenter];
+// dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ dispatch_queue_t queue = dispatch_get_global_queue(0, 0);
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), queue, ^{
+ NSInteger ret = [[AAAManager sharedInstance] stopL3VPNDirectly];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [strongSelf.view hideToastActivity];
+ [strongSelf dismissViewControllerAnimated:YES completion:nil];
+ });
+ });
+ }
+}
+
+- (void)logoutSilently {
+ [self stopVPNAndLogout:YES];
+
+ [self.navigationController dismissViewControllerAnimated:NO completion:nil]; // Dismiss modal view if exists.
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (Gateway *)getCurrentGateway {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+#pragma mark - VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANDebug(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ [self updateUIWithVPNStatus:tunnelStatus];
+}
+
+- (void)updateUIWithVPNStatus:(ArrayVPNStatus)status {
+ switch (status) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnected:
+ [self setVPNStatusAsDisconnected];
+ break;
+ case ArrayVPNDisconnecting:
+ [self setVPNStatusAsDisconnecting];
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ [self setVPNStatusAsConnecting];
+ break;
+ case ArrayVPNConnected:
+ [self setVPNSStatusAsConnected];
+ break;
+
+ default:
+ break;
+ }
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+#pragma mark - Number of Sections & Rows
+- (BOOL)isWebAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isWebAppConfigured && self.model.webApps.children.count > 0;
+}
+
+- (BOOL)isNativeAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isNativeAppConfigured && self.model.nativeApps.children.count > 0;
+}
+
+- (BOOL)isDesktopToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isDesktopConfigured && self.model.desktopApps.resourceItems.count > 0;
+}
+
+- (NSInteger)totalSections {
+ NSInteger totalSections = 0;
+ NSInteger webSection = [self isWebAppToShow] ? 1 : 0;
+ NSInteger nativeSection = [self isNativeAppToShow] ? 1 : 0;
+ NSInteger desktopSection = [self isDesktopToShow] ? 1 : 0;
+
+ totalSections = webSection + nativeSection + desktopSection;
+
+ return totalSections;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToSubResource]) {
+ SubResourceViewController *viewController = segue.destinationViewController;
+ [viewController setupModel:(NSArray *)sender];
+ }
+ if ([segue.identifier isEqualToString:kSegueToAccessModeSelect]) {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ UINavigationController *navController = (UINavigationController *)segue.destinationViewController;
+ AccessModeSelectViewController *controller = (AccessModeSelectViewController *)navController.topViewController;
+ controller.selectedAcsModeString = self.acsSelectedInfo;
+ controller.delegate = self;
+ }
+ }
+}
+
+#pragma mark - Get Child at Index
+- (NSArray *)didSelectWebAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", row);
+ return nil;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ if (app.type == APP_TYPE_WEBAPP) {
+ ZTWKWebViewController *control = [[ZTWKWebViewController alloc] init];
+ control.webUrl = [app.url absoluteString];
+ [self.navigationController pushViewController:control animated:YES];
+
+
+ return nil;
+ }
+
+ return app.children;
+}
+
+- (NSArray *)didSelectNativeAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.nativeApps.children.count) {
+ ANError(@"Index (%zi) is out range of native apps count.", row);
+ return nil;
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ NSURL *url = [NSURL URLWithString:app.scheme];
+ if (url.scheme == nil) {
+ url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://", app.scheme]];
+ }
+
+ ANInfo(@"open app url=%@", url);
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ BOOL isAppStoreApp = (app.installUrl != nil);
+ if (!isAppStoreApp) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), app.name];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:@""
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [app.name stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else {
+ ANError(@"appstore client don't support this case any more.");
+ }
+ }
+
+ return nil;
+}
+
+- (NSArray *)didSelectDesktopAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.desktopApps.resourceItems.count) {
+ ANError(@"Index (%zi) is out range of desktop apps count.", row);
+ return nil;
+ }
+
+ FolderItem *item = [self.desktops objectAtIndex:row];
+ if ([item isKindOfClass:[GCustomItem class]] && [item.name isEqualToString:NSLocalizedString(@"Other", nil)]) {
+ [self performSegueWithIdentifier:kSegueToCustomDesktop sender:self];
+ return nil;
+ } else if ([item isKindOfClass:[HostItem class]]) {
+ [self didSelectHostItem:(HostItem *)item atIndexPath:indexPath];
+ return nil;
+ }
+
+ return [self getSortedArray:[item.resourceItems allValues]];
+}
+
+#pragma mark - DesktopDirect
+- (void)didSelectHostItem:(HostItem *)hostItem atIndexPath:(NSIndexPath *)indexPath {
+ if (self.currentIndex
+ && self.currentIndex.row == indexPath.row
+ && hostItem.status < ResourceStatusReady) {
+ return;
+ }
+
+ self.currentIndex = indexPath;
+ self.currentItem = hostItem;
+
+ ResourceCell *cell = (ResourceCell *)[self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ __weak typeof(self) weakSelf = self;
+ [self.kvoController observe:hostItem
+ keyPath:@"status"
+ options:NSKeyValueObservingOptionNew
+ block:^(ResourcesViewController *observer, HostItem *host, NSDictionary *change) {
+ NSInteger hostStatus = host.status;
+
+
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [cell updateUI:host];
+ if (observer.currentIndex.row != indexPath.row) {
+ return;
+ }
+
+ if (observer.silence) {
+ return;
+ }
+ if (host.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:host];
+ } else {
+ [observer openRDClient:host];
+ }
+ // Reset power state
+ host.powerState = HostPowerStateDown;
+ return;
+ } else if (hostStatus >= ResourceStatusFailed && hostStatus < ResourceStatusResolveHostNameFailed) {
+ ANError(@"Cannot connect to remote host, error code: %zi", hostStatus);
+
+ if (hostStatus == ResourceStatusPowerDown) {
+ NSString *message = NSLocalizedString(@"It seems the remote host is turned off. Would you like to try and wake it up?", nil);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSInteger row = weakSelf.currentIndex.row;
+ HostItem *host = weakSelf.desktops[row];
+ [host wakeUp];
+ }
+ cancelAction:nil];
+
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ } else {
+ [observer.kvoController unobserve:host];
+ }
+ }
+ });
+ }];
+
+
+ NSThread *thread = [[NSThread alloc] initWithTarget:hostItem selector:@selector(prepare) object:nil];
+ [thread start];
+ [hostItem prepare];
+}
+
+- (void)openRDClient:(HostItem *)hostItem {
+ NSURL *url = hostItem.url;
+ if (!url) {
+ return;
+ }
+
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD client"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [@"RD client" stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openRDClientNEC:(HostItem *)hostItem {
+ NSURL *url = hostItem.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil),@"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (NSArray *)desktops {
+ if (!_desktops) {
+ _desktops = [self getSortedArray:[self.model.desktopApps.resourceItems allValues]];
+ }
+
+ return _desktops;
+}
+
+- (NSArray *)getSortedArray:(NSArray *)array {
+ if (!array || array.count == 0) {
+ ANWarn(@"Empty array, should not be sorted.");
+ return nil;
+ }
+
+ NSSortDescriptor *byClass = [NSSortDescriptor sortDescriptorWithKey:@"class" ascending:YES comparator:^NSComparisonResult(id obj1, id obj2) {
+ // Sort by class name
+ return [NSStringFromClass(obj1) compare:NSStringFromClass(obj2)];
+
+ }];
+
+ NSSortDescriptor *byName = [NSSortDescriptor sortDescriptorWithKey:@"name"
+ ascending:YES
+ selector:@selector(localizedStandardCompare:)];
+
+ NSArray *sortDescriptors = [NSArray arrayWithObjects:byClass, byName, nil];
+
+ return [array sortedArrayUsingDescriptors:sortDescriptors];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return [self totalSections];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+ if (section > totalSections) {
+ ANError(@"Section (%zi) is larger than total sections (%zi).", section, totalSections);
+
+ return 0;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.webApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.nativeApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.desktopApps.resourceItems.count;
+ return [NSNumber numberWithInteger:rows];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (UITableViewCell *)configureWebAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ BOOL isFolder = app.type == APP_TYPE_FOLDER;
+ if (isFolder) {
+ image = [UIImage imageNamed:FOLDER_APP_IMAGE_NAME];
+ } else {
+ image = [UIImage imageNamed:WEB_APP_IMAGE_NAME];
+ UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+ action:@selector(cellLongPressed:)];
+ [cell addGestureRecognizer:longPressGesture];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureNativeAppWithRow:(NSInteger)row {
+ NativeAppCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kNativeAppCellID];
+ if (!cell) {
+ cell = [[NativeAppCell alloc] init];
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ if (app.customIcon) {
+ image = app.customIcon;
+ } else if (app.appIcon) {
+ image = app.appIcon;
+ } else {
+ image = [UIImage imageNamed:NATIVE_APP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:NO]; // Native app doesn't support folder.
+ [cell setDescriptionContent:app.desc];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureDesktopAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ ResourceItem *item = [self.desktops objectAtIndex:row];
+ BOOL isFolder = [item isKindOfClass:[FolderItem class]]; // Only pub-app & self-defined desktop has folder.
+ BOOL isCustomDesktop = [item isKindOfClass:[GCustomItem class]];
+ if (isCustomDesktop) {
+ isFolder = YES;
+ }
+ UIImage *image = nil;
+ if (item.icon != nil) {
+ if ([item.description containsString:@"http.ico"]) {
+ image = [UIImage imageNamed:ZRT_HTTP_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate1.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE1_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate2.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE2_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient1.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT1_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient2.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT2_IMAGE_NAME];
+ } else {
+ image = item.icon;
+ }
+ } else {
+ image = (isFolder && !isCustomDesktop) ? [UIImage imageNamed:FOLDER_APP_IMAGE_NAME] : [UIImage imageNamed:DESKTOP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:item.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger row = indexPath.row;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ __weak typeof(self) weakSelf = self;
+ cell = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:[NSNumber numberWithInteger:row]
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureWebAppWithRow:row];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureNativeAppWithRow:row];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureDesktopAppWithRow:row];
+ }];
+ } else if([tableView isEqual:self.acsModeTableView]) {
+ if ([self.acsDescList count] > 0) {
+ AccessModeCell *accessModeCell = [self.acsModeTableView dequeueReusableCellWithIdentifier:kAccessModeCellID];
+ if (!accessModeCell) {
+ accessModeCell = [[AccessModeCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kAccessModeCellID];
+ }
+ NSString *showAcsDesc = [self.acsDescList objectAtIndex:0];
+ if ([self.acsDescList count] > 1) {
+ showAcsDesc = [NSString stringWithFormat:@"%@...", showAcsDesc];
+ }
+
+ [accessModeCell configureCellWithMessage:showAcsDesc isDescList:NO];
+ [accessModeCell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+
+ return accessModeCell;
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ }
+
+ return cell;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ NSString *title = @"";
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+
+ title = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return NSLocalizedString(@"Web App", nil);
+ }
+ action2:^id(id param) {
+ return NSLocalizedString(@"Native App", nil);
+ }
+ action3:^id(id param) {
+ return NSLocalizedString(@"Remote Desktop", nil);
+ }];
+ }
+
+ return title;
+}
+
+#pragma mark - Long press handler for WebApp
+- (void)cellLongPressed:(UIGestureRecognizer *)recognizer {
+ if (recognizer.state == UIGestureRecognizerStateBegan) {
+ CGPoint location = [recognizer locationInView:self.resourceTableView];
+ NSIndexPath *indexPath = [self.resourceTableView indexPathForRowAtPoint:location];
+ _longPressedIndex = indexPath.row;
+ ResourceCell *cell = [self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ [self showMenuWithCell:cell];
+ }
+}
+
+- (void)showMenuWithCell:(ResourceCell *)cell {
+ [cell becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *openItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Open in Safari", nil) action:@selector(openWebPage:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:openItem, nil]];
+ [controller setTargetRect:cell.contentView.frame inView:cell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)openWebPage:(id)sender {
+ if (_longPressedIndex >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", _longPressedIndex);
+ return;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:_longPressedIndex];
+ if (app.type == APP_TYPE_WEBAPP) {
+ [[UIApplication sharedApplication] openURL:app.url];
+ }
+}
+
+#pragma mark - TimerRuleDelegate
+- (void)shouldSignOut {
+ [self logoutSilently];
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ [self.resourceTableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger totalSections = [self totalSections];
+ NSInteger section = indexPath.section;
+ NSArray *children = nil;
+
+ __weak typeof(self) weakSelf = self;
+ children = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:indexPath
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectWebAppAtIndexPath:indexPath];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectNativeAppAtIndexPath:indexPath];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectDesktopAtIndexPath:indexPath];
+ }];
+
+ if (children != nil) {
+ [self performSegueWithIdentifier:kSegueToSubResource sender:children];
+ }
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ [self.acsModeTableView deselectRowAtIndexPath:indexPath animated:YES];
+ if ([self.acsDescList count] > 0) {
+ [self performSegueWithIdentifier:kSegueToAccessModeSelect sender:self];
+ }
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return 39;
+ }
+
+ return 0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ static CGFloat kDefaultCellHeight = 44.0;
+ static CGFloat kNativeCellHeight = 66.0;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }
+ action2:^id(id param) {
+ return [NSNumber numberWithFloat:kNativeCellHeight];
+ }
+ action3:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 44;
+ }
+
+ return 0;
+}
+
+#pragma mark - Helper
+typedef id (^Action)(id param);
+
+- (id)getCellInfoInSection:(NSInteger)section
+ totalSection:(NSInteger)totalSection
+ object:(id)object
+ action1:(Action)action1
+ action2:(Action)action2
+ action3:(Action)action3 {
+ id result = nil;
+
+ switch (totalSection) {
+ case kResourceSectionOne: {
+ if ([self isWebAppToShow]) {
+ result = action1(object);
+ } else if ([self isNativeAppToShow]) {
+ result = action2(object);
+ } else if ([self isDesktopToShow]) {
+ result = action3(object);
+ }
+ break;
+ }
+ case kResourceSectionTwo:
+ if ([self isWebAppToShow]) {
+ if ([self isNativeAppToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ }
+ } else if ([self isDesktopToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ } else if ([self isNativeAppToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ break;
+ case kResourceSectionThree:
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex2) {
+ result = action3(object);
+ }
+ break;
+
+ default:
+ ANError(@"Invalid sections number of (%zi) received.", section);
+ break;
+ }
+
+ return result;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.InfosecEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.InfosecEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.InfosecEnterprise (working copy)
@@ -0,0 +1,1319 @@
+//
+// ResourcesViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "PubAppItem.h"
+#import "FBKVOController.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "GatewayManager.h"
+#import "CertificateManager.h"
+#import "ConfigurationManager.h"
+#import "RulesManager.h"
+#import "ResourceCell.h"
+#import "MJRefresh.h"
+#import "NativeAppCell.h"
+#import "AutoLoginHandler.h"
+#import "SubResourceViewController.h"
+#import "UIView+Toast.h"
+#import "ResourcesViewController.h"
+#import "AccessModeCell.h"
+#import "AccessModeSelectViewController.h"
+#import "ZTWKWebViewController.h"
+
+static NSString * const kSegueToSubResource = @"ResourceToSubResource";
+static NSString * const kSegueToCustomDesktop = @"ResourceToCustomDesktop";
+static NSString * const kSegueToAccessModeSelect = @"ResourceToAccessModeSelect";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameResource = @"group.net.infosec.groupenterprise";
+NSString * const kArrayVPNTunelErrorMsgResource = @"net.arraynetworks.sslvpn.errormsg";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameResource = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+typedef NS_ENUM(NSInteger, ResourceSectionNumber) {
+ kResourceSectionZero = 0,
+ kResourceSectionOne,
+ kResourceSectionTwo,
+ kResourceSectionThree
+};
+
+typedef NS_ENUM(NSInteger, ResourceSectionIndex) {
+ kResourceSectionIndex0 = 0,
+ kResourceSectionIndex1,
+ kResourceSectionIndex2
+};
+
+@interface ResourcesViewController () {
+ NSInteger _longPressedIndex;
+}
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+@property (weak, nonatomic) IBOutlet UISwitch *vpnEnableSwitch;
+@property (weak, nonatomic) IBOutlet UIImageView *statusImageView;
+
+@property (weak, nonatomic) IBOutlet UIView *messageView;
+@property (weak, nonatomic) IBOutlet UILabel *messageLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *emptyResourceView;
+@property (weak, nonatomic) IBOutlet UIImageView *emptyResourceImageView;
+@property (weak, nonatomic) IBOutlet UILabel *emptyResourceLabel;
+
+@property (weak, nonatomic) IBOutlet UITableView *resourceTableView;
+
+@property (weak, nonatomic) IBOutlet UITableView *acsModeTableView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *resourceViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *emptyViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageViewTopConstraint;
+
+@property (strong, nonatomic) AppManager *model;
+@property (strong, nonatomic) NSArray *desktops; // As a cache
+
+@property (strong, nonatomic) NSArray *acsDescList;
+@property (strong, nonatomic) NSArray *acsNameList;
+@property (strong, nonatomic) NSString *acsSelectedInfo;
+
+
+@property (strong, nonatomic) id browser;
+
+// For DesktopDirect
+@property (nonatomic, strong) NSIndexPath *currentIndex;
+@property (nonatomic, strong) ResourceItem *currentItem;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic) BOOL silence;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation ResourcesViewController
+
+@synthesize desktops = _desktops;
+
+- (void)dealloc {
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [AppManager sharedInstance];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleAutoLogout:)
+ name:kAutoLogoutNotification
+ object:nil];
+
+ [self setVPNStatusAsDisconnected];
+ [self autoStartVPN];
+ [self doPostLoginCV];
+
+ [self initKVOController];
+
+ [self initTopView];
+ [self initAccessModeView];
+ [self initPullToRefresh];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+
+ self.silence = YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.silence = NO;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+
+ RulesManager *manager = [RulesManager sharedInstance];
+ if (manager.didEndSession) {
+ manager.didEndSession = NO;
+
+ [self logoutSilently];
+ }
+}
+
+- (void)initAccessModeView {
+ BOOL bShowAcsModeView = NO;
+
+ self.acsSelectedInfo = nil;
+ self.acsDescList = [AAAManager sharedInstance].acsModeDesc;
+ self.acsNameList = [AAAManager sharedInstance].acsModeName;
+ if (self.acsDescList != nil) {
+ bShowAcsModeView = YES;
+ }
+
+ if (bShowAcsModeView) {
+ self.acsModeTableView.hidden = NO;
+ self.resourceViewTopConstraint.constant = 95;
+ self.emptyViewTopConstraint.constant = 100;
+ self.messageViewTopConstraint.constant = 100;
+ self.acsModeTableView.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0,0,0,0.01)];
+ } else {
+ self.acsModeTableView.hidden = YES;
+ self.resourceViewTopConstraint.constant = 45;
+ self.emptyViewTopConstraint.constant = 50;
+ self.messageViewTopConstraint.constant = 50;
+ }
+
+ self.needReconnect = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Would you like to sign out?", nil)
+ confirmAction:^{
+ [weakSelf stopVPNAndLogout:NO];
+ }
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (IBAction)vpnEnableSwitched:(id)sender {
+ if (self.vpnEnableSwitch.on) {
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+ } else {
+ [self stopVPN];
+ }
+}
+
+- (void)initTopView {
+ [self.acsModeTableView registerNib:[UINib nibWithNibName:@"AccessModeCell" bundle:nil] forCellReuseIdentifier:kAccessModeCellID];
+ if (self.model.isEmpty) {
+ [self showEmptyResouceView];
+ } else {
+ [self showResourceTableView];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"ResourceCell" bundle:nil] forCellReuseIdentifier:kResourceCellID];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"NativeAppCell" bundle:nil] forCellReuseIdentifier:kNativeAppCellID];
+ }
+}
+
+- (void)initPullToRefresh {
+ __weak typeof(self) weakSelf = self;
+ self.resourceTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ [strongSelf endRefresh];
+
+ Gateway *currentGateway = [self getCurrentGateway];
+ if (currentGateway) {
+ [[AppManager sharedInstance] fetchAppsFromServer:currentGateway.host
+ port:currentGateway.port
+ completion:^(BOOL isNeedUpdate) {
+ [strongSelf.resourceTableView reloadData];
+ }];
+ }
+ }];
+}
+
+- (void)endRefresh{
+ [self.resourceTableView.mj_header endRefreshing];
+}
+
+- (void)doPostLoginCV {
+ [[RulesManager sharedInstance] setDelegate:self];
+
+ /**
+ * It may not be a reliable way to do post login Client Verification.
+ * Maybe we should listen to the VPN_CB_CV_USER message.
+ */
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ RulesManager *manager = [RulesManager sharedInstance];
+ [manager cleanTimerRuleInteraction];
+ [manager kickoffTimerRules];
+ });
+
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)initKVOController {
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+#pragma mark - Access Mode
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ [cells addObject:[tableView cellForRowAtIndexPath:indexPath]];
+ }
+ }
+ return cells;
+}
+
+- (int)switchAccessMode:(NSString *)acsDesc {
+ int ret = ERROR_ACM_SUCCESS;
+ BOOL isMatchDesc = NO;
+
+ if ([self.acsDescList count] == [self.acsNameList count]) {
+ for (NSUInteger i =0; i < [self.acsDescList count]; i++) {
+ if ([[self.acsDescList objectAtIndex:i] isEqualToString:acsDesc]) {
+ isMatchDesc = YES;
+ ret = array_vpn_access_mode_set([[self.acsNameList objectAtIndex:i] UTF8String], NULL, NULL, 0);
+ break;
+ }
+ }
+ }
+
+ if (!isMatchDesc) {
+ ANError(@"switchAccessMode: get match access mode message failed, switch failed return error.");
+ ret = ERROR_ACM_UNDEFINE;
+ }
+
+ return ret;
+}
+
+- (void)accessModeRestartVPN{
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+}
+
+- (void)didFinishSelect:(NSString *)selectAcsDesc {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ NSString *currentAcsDesc = [cell getCellText];
+ if ([selectAcsDesc length] > 0) {
+ if ([currentAcsDesc isEqualToString:selectAcsDesc]) {
+ ANInfo(@"didFinishSelect: user select same access mode ,do nothing.");
+ } else {
+ ANInfo(@"didFinishSelect: user select access mode[%@]", selectAcsDesc);
+ [cell setCellText:selectAcsDesc];
+ [cell showActiveView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ int ret = [self switchAccessMode:selectAcsDesc];
+ NSString *errorMessage = nil;
+ switch (ret) {
+ case ERROR_ACM_SUCCESS:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ break;
+ case ERROR_ACM_SUCCESS_RECONN:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus == ArrayVPNConnected) {
+ ANInfo(@"didFinishSelect:vpn status is connected, need reconnect.");
+ self.needReconnect = YES;
+ [self stopVPN];
+ } else {
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+ break;
+ case ERROR_ACM_WITHOUT_SESSION:
+ errorMessage = NSLocalizedString(@"Switching failure: invalid user session. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_INVALID:
+ errorMessage = NSLocalizedString(@"Switching failure: illegal mode information. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_NONE:
+ errorMessage = NSLocalizedString(@"Switching failure: mode information does not exist. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_INVALID_PARAMETER:
+ errorMessage = NSLocalizedString(@"Switching failure: incorrect parameter. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_ACL_CHANGE_FAILED:
+ errorMessage = NSLocalizedString(@"Switching failure: the server fails to switch. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NETWORK:
+ errorMessage = NSLocalizedString(@"Switching failure: network error. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_UNDEFINE:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ default:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ }
+ if (errorMessage && errorMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error",nil) message:errorMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ [cell showActiveView:NO];
+ [cell setCellText:currentAcsDesc];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ for (NSString *info in self.acsDescList) {
+ if ([selectAcsDesc isEqualToString:info]) {
+ self.acsSelectedInfo = info;
+ }
+ }
+ }
+ ANInfo(@"didFinishSelect:switch access mode finished, select access mode=%@.", self.acsSelectedInfo);
+ });
+ }
+ }
+ }
+}
+
+#pragma mark - Auto Logout
+- (void)handleAutoLogout:(NSNotification *)notification {
+ [self logoutSilently];
+}
+
+- (void)clearCookies { // ANsession should be cleared on logout. (for WebAuth)
+#define MP_SESSION_PREFIX @"ANsession"
+#define MP_USERNAME_COOKIE @"username"
+#define MP_ACCESS_NAME @"acs_mode"
+#define MP_ACCESS_DESC @"acs_desc"
+
+ NSHTTPCookieStorage *cookieJar = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+ NSArray *cookies = cookieJar.cookies;
+ for (NSHTTPCookie *cookie in cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE] ||[cookie.name containsString:MP_SESSION_PREFIX] || [cookie.name containsString:MP_ACCESS_NAME] || [cookie.name containsString:MP_ACCESS_DESC]) {
+ [cookieJar deleteCookie:cookie];
+ }
+ }
+ }
+}
+
+#pragma mark - VPN Status
+#define STATUS_LABEL_COLOR_NORMAL UIColorFromRGBA(0x666666, 1.0)
+#define STATUS_LABEL_COLOR_WARNING UIColorFromRGBA(0xff0000, 1.0)
+#define STATUS_LABEL_COLOR_GREEN UIColorFromRGBA(0x42a009, 1.0)
+
+- (void)setVPNStatusAsConnecting {
+ self.activityIndicator.hidden = NO;
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Connecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNSStatusAsConnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_GREEN;
+ self.statusLabel.text = NSLocalizedString(@"Connected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectSuccess"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsDisconnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+ if (self.needReconnect) {
+ ANInfo(@"access mode disconnect vpn finished, now need restart vpn.");
+ self.needReconnect = NO;
+ [self accessModeRestartVPN];
+ }
+}
+
+- (void)setVPNStatusAsDisconnecting {
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsError:(NSString *)errorMessage {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_WARNING;
+ self.statusLabel.text = NSLocalizedString(@"Connect failed", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:errorMessage];
+}
+
+- (void)showMessageViewWithInfo:(NSString *)info {
+ if (info) {
+ self.messageLabel.text = info;
+ self.messageView.hidden = NO;
+ } else {
+ self.messageLabel.text = @"";
+ self.messageView.hidden = YES;
+ }
+}
+
+- (void)showEmptyResouceView {
+ self.emptyResourceView.hidden = NO;
+ self.resourceTableView.hidden = YES;
+ [self.view bringSubviewToFront:self.emptyResourceView];
+}
+
+- (void)showResourceTableView {
+ self.emptyResourceView.hidden = YES;
+ self.resourceTableView.hidden = NO;
+ [self.view bringSubviewToFront:self.resourceTableView];
+}
+
+#pragma mark - VPN Related
+- (BOOL)autoStartVPN {
+ BOOL isAutoStart = NO;
+ Gateway *gateway = [self getCurrentGateway];
+
+ if (!gateway) {
+ isAutoStart = YES;
+ ANInfo(@"No gateway is selected, it is auto start vpn.");
+ } else {
+ if (!gateway.isSecureTunnelEnabled) {
+ ANInfo(@"Auto start VPN is not enabled.");
+ return NO;
+ }
+ }
+
+ return [self startVPN:isAutoStart];
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameResource];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+
+ return YES;
+
+// if (isAutoStart) {
+// [vpnWrapper startSSLVPN];
+// }
+//
+// return [vpnWrapper validateSessionWithHost:gateway.host
+// port:gateway.port
+// session:session
+// completion:^(BOOL isSuccess, NSError *error) {
+// if (isSuccess) {
+// [vpnWrapper startSSLVPN];
+// } else {
+// NSString *message = NSLocalizedString(@"Session is invalid, please login again!", nil);
+// PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+// message:message
+// action:^{
+// [[NSNotificationCenter defaultCenter]
+// postNotificationName:kAutoLogoutNotification
+// object:nil];
+// }];
+// [self presentViewController:dialog animated:YES completion:nil];
+// }
+// }];
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+- (void)stopVPNAndLogout:(BOOL)isSilent {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{ // Stop timer rules fisrt.
+ [[RulesManager sharedInstance] stopAllRules];
+ });
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager continueVPNThreadWithAccount:nil];
+ [self stopVPN];
+
+ [self clearCookies];
+
+ if (!isSilent) {
+ __weak typeof(self) weakSelf = self;
+ [self.view makeToastActivity:CSToastPositionCenter];
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [[AAAManager sharedInstance] stopL3VPNDirectly];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [strongSelf.view hideToastActivity];
+ [strongSelf dismissViewControllerAnimated:YES completion:nil];
+ });
+ });
+ }
+}
+
+- (void)logoutSilently {
+ [self stopVPNAndLogout:YES];
+
+ [self.navigationController dismissViewControllerAnimated:NO completion:nil]; // Dismiss modal view if exists.
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (Gateway *)getCurrentGateway {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+#pragma mark - VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANDebug(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ [self updateUIWithVPNStatus:tunnelStatus];
+}
+
+- (void)updateUIWithVPNStatus:(ArrayVPNStatus)status {
+ switch (status) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnected:
+ [self setVPNStatusAsDisconnected];
+ break;
+ case ArrayVPNDisconnecting:
+ [self setVPNStatusAsDisconnecting];
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ [self setVPNStatusAsConnecting];
+ break;
+ case ArrayVPNConnected:
+ [self setVPNSStatusAsConnected];
+ break;
+
+ default:
+ break;
+ }
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+#pragma mark - Number of Sections & Rows
+- (BOOL)isWebAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isWebAppConfigured && self.model.webApps.children.count > 0;
+}
+
+- (BOOL)isNativeAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isNativeAppConfigured && self.model.nativeApps.children.count > 0;
+}
+
+- (BOOL)isDesktopToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isDesktopConfigured && self.model.desktopApps.resourceItems.count > 0;
+}
+
+- (NSInteger)totalSections {
+ NSInteger totalSections = 0;
+ NSInteger webSection = [self isWebAppToShow] ? 1 : 0;
+ NSInteger nativeSection = [self isNativeAppToShow] ? 1 : 0;
+ NSInteger desktopSection = [self isDesktopToShow] ? 1 : 0;
+
+ totalSections = webSection + nativeSection + desktopSection;
+
+ return totalSections;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToSubResource]) {
+ SubResourceViewController *viewController = segue.destinationViewController;
+ [viewController setupModel:(NSArray *)sender];
+ }
+ if ([segue.identifier isEqualToString:kSegueToAccessModeSelect]) {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ UINavigationController *navController = (UINavigationController *)segue.destinationViewController;
+ AccessModeSelectViewController *controller = (AccessModeSelectViewController *)navController.topViewController;
+ controller.selectedAcsModeString = self.acsSelectedInfo;
+ controller.delegate = self;
+ }
+ }
+}
+
+#pragma mark - Get Child at Index
+- (NSArray *)didSelectWebAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", row);
+ return nil;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ if (app.type == APP_TYPE_WEBAPP) {
+ ZTWKWebViewController *control = [[ZTWKWebViewController alloc] init];
+ control.webUrl = [app.url absoluteString];
+ [self.navigationController pushViewController:control animated:YES];
+
+
+ return nil;
+ }
+
+ return app.children;
+}
+
+- (NSArray *)didSelectNativeAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.nativeApps.children.count) {
+ ANError(@"Index (%zi) is out range of native apps count.", row);
+ return nil;
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ NSURL *url = [NSURL URLWithString:app.scheme];
+ if (url.scheme == nil) {
+ url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://", app.scheme]];
+ }
+
+ ANInfo(@"open app url=%@", url);
+ if (!OpenURL(url)) {
+ BOOL isAppStoreApp = (app.installUrl != nil);
+ if (!isAppStoreApp) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), app.name];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:@""
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [app.name stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else {
+ NSString *urlString = [NSString stringWithFormat:ITMS_SERVICE_PREFIX, app.installUrl];
+ ANInfo(@"Download app url=%@, scheme=%@", urlString, app.scheme);
+ if ([app.scheme containsString:@"voffice"]) {
+ urlString = @"http://app.arraynetworks.com.cn/voffice2";
+ }
+ if ([app.scheme containsString:@"zrOA"]) {
+ urlString = @"http://app.arraynetworks.com.cn/sufei";
+ }
+ if ([app.scheme containsString:@"zrlcsApp"]) {
+ urlString = @"http://app.arraynetworks.com.cn/staf";
+ }
+ OpenURL([NSURL URLWithString:urlString]); // Install directly from AG.
+ }
+ }
+
+ return nil;
+}
+
+- (NSArray *)didSelectDesktopAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.desktopApps.resourceItems.count) {
+ ANError(@"Index (%zi) is out range of desktop apps count.", row);
+ return nil;
+ }
+
+ FolderItem *item = [self.desktops objectAtIndex:row];
+ if ([item isKindOfClass:[GCustomItem class]] && [item.name isEqualToString:NSLocalizedString(@"Other", nil)]) {
+ [self performSegueWithIdentifier:kSegueToCustomDesktop sender:self];
+ return nil;
+ } else if ([item isKindOfClass:[HostItem class]]) {
+ [self didSelectHostItem:(HostItem *)item atIndexPath:indexPath];
+ return nil;
+ }
+
+ return [self getSortedArray:[item.resourceItems allValues]];
+}
+
+#pragma mark - DesktopDirect
+- (void)didSelectHostItem:(HostItem *)hostItem atIndexPath:(NSIndexPath *)indexPath {
+ if (self.currentIndex
+ && self.currentIndex.row == indexPath.row
+ && hostItem.status < ResourceStatusReady) {
+ return;
+ }
+
+ self.currentIndex = indexPath;
+ self.currentItem = hostItem;
+
+ ResourceCell *cell = (ResourceCell *)[self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ __weak typeof(self) weakSelf = self;
+ [self.kvoController observe:hostItem
+ keyPath:@"status"
+ options:NSKeyValueObservingOptionNew
+ block:^(ResourcesViewController *observer, HostItem *host, NSDictionary *change) {
+ NSInteger hostStatus = host.status;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [cell updateUI:host];
+ if (observer.currentIndex.row != indexPath.row) {
+ return;
+ }
+
+ if (observer.silence) {
+ return;
+ }
+ if (host.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:host];
+ } else {
+ [observer openRDClient:host];
+ }
+ // Reset power state
+ host.powerState = HostPowerStateDown;
+ return;
+ } else if (hostStatus >= ResourceStatusFailed && hostStatus < ResourceStatusResolveHostNameFailed) {
+ ANError(@"Cannot connect to remote host, error code: %zi", hostStatus);
+
+ if (hostStatus == ResourceStatusPowerDown) {
+ NSString *message = NSLocalizedString(@"It seems the remote host is turned off. Would you like to try and wake it up?", nil);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSInteger row = weakSelf.currentIndex.row;
+ HostItem *host = weakSelf.desktops[row];
+ [host wakeUp];
+ }
+ cancelAction:nil];
+
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ } else {
+ [observer.kvoController unobserve:host];
+ }
+ }
+ });
+ }];
+
+ [hostItem prepare];
+}
+
+- (void)openRDClient:(HostItem *)hostItem {
+ NSURL *url = hostItem.url;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD client"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [@"RD client" stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openRDClientNEC:(HostItem *)hostItem {
+ NSURL *url = hostItem.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil),@"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (NSArray *)desktops {
+ if (!_desktops) {
+ _desktops = [self getSortedArray:[self.model.desktopApps.resourceItems allValues]];
+ }
+
+ return _desktops;
+}
+
+- (NSArray *)getSortedArray:(NSArray *)array {
+ if (!array || array.count == 0) {
+ ANWarn(@"Empty array, should not be sorted.");
+ return nil;
+ }
+
+ NSSortDescriptor *byClass = [NSSortDescriptor sortDescriptorWithKey:@"class" ascending:YES comparator:^NSComparisonResult(id obj1, id obj2) {
+ // Sort by class name
+ return [NSStringFromClass(obj1) compare:NSStringFromClass(obj2)];
+
+ }];
+
+ NSSortDescriptor *byName = [NSSortDescriptor sortDescriptorWithKey:@"name"
+ ascending:YES
+ selector:@selector(localizedStandardCompare:)];
+
+ NSArray *sortDescriptors = [NSArray arrayWithObjects:byClass, byName, nil];
+
+ return [array sortedArrayUsingDescriptors:sortDescriptors];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return [self totalSections];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+ if (section > totalSections) {
+ ANError(@"Section (%zi) is larger than total sections (%zi).", section, totalSections);
+
+ return 0;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.webApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.nativeApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.desktopApps.resourceItems.count;
+ return [NSNumber numberWithInteger:rows];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (UITableViewCell *)configureWebAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ BOOL isFolder = app.type == APP_TYPE_FOLDER;
+ if (isFolder) {
+ image = [UIImage imageNamed:FOLDER_APP_IMAGE_NAME];
+ } else {
+ image = [UIImage imageNamed:WEB_APP_IMAGE_NAME];
+ UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+ action:@selector(cellLongPressed:)];
+ [cell addGestureRecognizer:longPressGesture];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureNativeAppWithRow:(NSInteger)row {
+ NativeAppCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kNativeAppCellID];
+ if (!cell) {
+ cell = [[NativeAppCell alloc] init];
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ if (app.customIcon) {
+ image = app.customIcon;
+ } else if (app.appIcon) {
+ image = app.appIcon;
+ } else {
+ image = [UIImage imageNamed:NATIVE_APP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:NO]; // Native app doesn't support folder.
+ [cell setDescriptionContent:app.desc];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureDesktopAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ ResourceItem *item = [self.desktops objectAtIndex:row];
+ BOOL isFolder = [item isKindOfClass:[FolderItem class]]; // Only pub-app & self-defined desktop has folder.
+ BOOL isCustomDesktop = [item isKindOfClass:[GCustomItem class]];
+ if (isCustomDesktop) {
+ isFolder = YES;
+ }
+ UIImage *image = nil;
+ if (item.icon != nil) {
+ if ([item.description containsString:@"http.ico"]) {
+ image = [UIImage imageNamed:ZRT_HTTP_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate1.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE1_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate2.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE2_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient1.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT1_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient2.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT2_IMAGE_NAME];
+ } else {
+ image = item.icon;
+ }
+ } else {
+ image = (isFolder && !isCustomDesktop) ? [UIImage imageNamed:FOLDER_APP_IMAGE_NAME] : [UIImage imageNamed:DESKTOP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:item.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger row = indexPath.row;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ __weak typeof(self) weakSelf = self;
+ cell = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:[NSNumber numberWithInteger:row]
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureWebAppWithRow:row];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureNativeAppWithRow:row];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureDesktopAppWithRow:row];
+ }];
+ } else if([tableView isEqual:self.acsModeTableView]) {
+ if ([self.acsDescList count] > 0) {
+ AccessModeCell *accessModeCell = [self.acsModeTableView dequeueReusableCellWithIdentifier:kAccessModeCellID];
+ if (!accessModeCell) {
+ accessModeCell = [[AccessModeCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kAccessModeCellID];
+ }
+ NSString *showAcsDesc = [self.acsDescList objectAtIndex:0];
+ if ([self.acsDescList count] > 1) {
+ showAcsDesc = [NSString stringWithFormat:@"%@...", showAcsDesc];
+ }
+
+ [accessModeCell configureCellWithMessage:showAcsDesc isDescList:NO];
+ [accessModeCell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+
+ return accessModeCell;
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ }
+
+ return cell;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ NSString *title = @"";
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+
+ title = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return NSLocalizedString(@"Web App", nil);
+ }
+ action2:^id(id param) {
+ return NSLocalizedString(@"Native App", nil);
+ }
+ action3:^id(id param) {
+ return NSLocalizedString(@"Remote Desktop", nil);
+ }];
+ }
+
+ return title;
+}
+
+#pragma mark - Long press handler for WebApp
+- (void)cellLongPressed:(UIGestureRecognizer *)recognizer {
+ if (recognizer.state == UIGestureRecognizerStateBegan) {
+ CGPoint location = [recognizer locationInView:self.resourceTableView];
+ NSIndexPath *indexPath = [self.resourceTableView indexPathForRowAtPoint:location];
+ _longPressedIndex = indexPath.row;
+ ResourceCell *cell = [self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ [self showMenuWithCell:cell];
+ }
+}
+
+- (void)showMenuWithCell:(ResourceCell *)cell {
+ [cell becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *openItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Open in Safari", nil) action:@selector(openWebPage:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:openItem, nil]];
+ [controller setTargetRect:cell.contentView.frame inView:cell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)openWebPage:(id)sender {
+ if (_longPressedIndex >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", _longPressedIndex);
+ return;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:_longPressedIndex];
+ if (app.type == APP_TYPE_WEBAPP) {
+ [[UIApplication sharedApplication] openURL:app.url];
+ }
+}
+
+#pragma mark - TimerRuleDelegate
+- (void)shouldSignOut {
+ [self logoutSilently];
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ [self.resourceTableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger totalSections = [self totalSections];
+ NSInteger section = indexPath.section;
+ NSArray *children = nil;
+
+ __weak typeof(self) weakSelf = self;
+ children = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:indexPath
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectWebAppAtIndexPath:indexPath];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectNativeAppAtIndexPath:indexPath];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectDesktopAtIndexPath:indexPath];
+ }];
+
+ if (children != nil) {
+ [self performSegueWithIdentifier:kSegueToSubResource sender:children];
+ }
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ [self.acsModeTableView deselectRowAtIndexPath:indexPath animated:YES];
+ if ([self.acsDescList count] > 0) {
+ [self performSegueWithIdentifier:kSegueToAccessModeSelect sender:self];
+ }
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return 39;
+ }
+
+ return 0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ static CGFloat kDefaultCellHeight = 44.0;
+ static CGFloat kNativeCellHeight = 66.0;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }
+ action2:^id(id param) {
+ return [NSNumber numberWithFloat:kNativeCellHeight];
+ }
+ action3:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 44;
+ }
+
+ return 0;
+}
+
+#pragma mark - Helper
+typedef id (^Action)(id param);
+
+- (id)getCellInfoInSection:(NSInteger)section
+ totalSection:(NSInteger)totalSection
+ object:(id)object
+ action1:(Action)action1
+ action2:(Action)action2
+ action3:(Action)action3 {
+ id result = nil;
+
+ switch (totalSection) {
+ case kResourceSectionOne: {
+ if ([self isWebAppToShow]) {
+ result = action1(object);
+ } else if ([self isNativeAppToShow]) {
+ result = action2(object);
+ } else if ([self isDesktopToShow]) {
+ result = action3(object);
+ }
+ break;
+ }
+ case kResourceSectionTwo:
+ if ([self isWebAppToShow]) {
+ if ([self isNativeAppToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ }
+ } else if ([self isDesktopToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ } else if ([self isNativeAppToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ break;
+ case kResourceSectionThree:
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex2) {
+ result = action3(object);
+ }
+ break;
+
+ default:
+ ANError(@"Invalid sections number of (%zi) received.", section);
+ break;
+ }
+
+ return result;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.InfosecStore
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.InfosecStore (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.InfosecStore (working copy)
@@ -0,0 +1,1308 @@
+//
+// ResourcesViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "PubAppItem.h"
+#import "FBKVOController.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "GatewayManager.h"
+#import "CertificateManager.h"
+#import "ConfigurationManager.h"
+#import "RulesManager.h"
+#import "ResourceCell.h"
+#import "MJRefresh.h"
+#import "NativeAppCell.h"
+#import "AutoLoginHandler.h"
+#import "SubResourceViewController.h"
+#import "UIView+Toast.h"
+#import "ResourcesViewController.h"
+#import "AccessModeCell.h"
+#import "AccessModeSelectViewController.h"
+#import "ZTWKWebViewController.h"
+
+static NSString * const kSegueToSubResource = @"ResourceToSubResource";
+static NSString * const kSegueToCustomDesktop = @"ResourceToCustomDesktop";
+static NSString * const kSegueToAccessModeSelect = @"ResourceToAccessModeSelect";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameResource = @"group.net.infosec.MotionPro";
+NSString * const kArrayVPNTunelErrorMsgResource = @"net.arraynetworks.sslvpn.errormsg";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameResource = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+typedef NS_ENUM(NSInteger, ResourceSectionNumber) {
+ kResourceSectionZero = 0,
+ kResourceSectionOne,
+ kResourceSectionTwo,
+ kResourceSectionThree
+};
+
+typedef NS_ENUM(NSInteger, ResourceSectionIndex) {
+ kResourceSectionIndex0 = 0,
+ kResourceSectionIndex1,
+ kResourceSectionIndex2
+};
+
+@interface ResourcesViewController () {
+ NSInteger _longPressedIndex;
+}
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+@property (weak, nonatomic) IBOutlet UISwitch *vpnEnableSwitch;
+@property (weak, nonatomic) IBOutlet UIImageView *statusImageView;
+
+@property (weak, nonatomic) IBOutlet UIView *messageView;
+@property (weak, nonatomic) IBOutlet UILabel *messageLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *emptyResourceView;
+@property (weak, nonatomic) IBOutlet UIImageView *emptyResourceImageView;
+@property (weak, nonatomic) IBOutlet UILabel *emptyResourceLabel;
+
+@property (weak, nonatomic) IBOutlet UITableView *resourceTableView;
+
+@property (weak, nonatomic) IBOutlet UITableView *acsModeTableView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *resourceViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *emptyViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageViewTopConstraint;
+
+@property (strong, nonatomic) AppManager *model;
+@property (strong, nonatomic) NSArray *desktops; // As a cache
+
+@property (strong, nonatomic) NSArray *acsDescList;
+@property (strong, nonatomic) NSArray *acsNameList;
+@property (strong, nonatomic) NSString *acsSelectedInfo;
+
+
+@property (strong, nonatomic) id browser;
+
+// For DesktopDirect
+@property (nonatomic, strong) NSIndexPath *currentIndex;
+@property (nonatomic, strong) ResourceItem *currentItem;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic) BOOL silence;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation ResourcesViewController
+
+@synthesize desktops = _desktops;
+
+- (void)dealloc {
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [AppManager sharedInstance];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleAutoLogout:)
+ name:kAutoLogoutNotification
+ object:nil];
+
+ [self setVPNStatusAsDisconnected];
+ [self autoStartVPN];
+ [self doPostLoginCV];
+
+ [self initKVOController];
+
+ [self initTopView];
+ [self initAccessModeView];
+ [self initPullToRefresh];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+
+ self.silence = YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.silence = NO;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+
+ RulesManager *manager = [RulesManager sharedInstance];
+ if (manager.didEndSession) {
+ manager.didEndSession = NO;
+
+ [self logoutSilently];
+ }
+}
+
+- (void)initAccessModeView {
+ BOOL bShowAcsModeView = NO;
+
+ self.acsSelectedInfo = nil;
+ self.acsDescList = [AAAManager sharedInstance].acsModeDesc;
+ self.acsNameList = [AAAManager sharedInstance].acsModeName;
+ if (self.acsDescList != nil) {
+ bShowAcsModeView = YES;
+ }
+
+ if (bShowAcsModeView) {
+ self.acsModeTableView.hidden = NO;
+ self.resourceViewTopConstraint.constant = 95;
+ self.emptyViewTopConstraint.constant = 100;
+ self.messageViewTopConstraint.constant = 100;
+ self.acsModeTableView.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0,0,0,0.01)];
+ } else {
+ self.acsModeTableView.hidden = YES;
+ self.resourceViewTopConstraint.constant = 45;
+ self.emptyViewTopConstraint.constant = 50;
+ self.messageViewTopConstraint.constant = 50;
+ }
+
+ self.needReconnect = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Would you like to sign out?", nil)
+ confirmAction:^{
+ [weakSelf stopVPNAndLogout:NO];
+ }
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (IBAction)vpnEnableSwitched:(id)sender {
+ if (self.vpnEnableSwitch.on) {
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+ } else {
+ [self stopVPN];
+ }
+}
+
+- (void)initTopView {
+ [self.acsModeTableView registerNib:[UINib nibWithNibName:@"AccessModeCell" bundle:nil] forCellReuseIdentifier:kAccessModeCellID];
+ if (self.model.isEmpty) {
+ [self showEmptyResouceView];
+ } else {
+ [self showResourceTableView];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"ResourceCell" bundle:nil] forCellReuseIdentifier:kResourceCellID];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"NativeAppCell" bundle:nil] forCellReuseIdentifier:kNativeAppCellID];
+ }
+}
+
+- (void)initPullToRefresh {
+ __weak typeof(self) weakSelf = self;
+ self.resourceTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ [strongSelf endRefresh];
+
+ Gateway *currentGateway = [self getCurrentGateway];
+ if (currentGateway) {
+ [[AppManager sharedInstance] fetchAppsFromServer:currentGateway.host
+ port:currentGateway.port
+ completion:^(BOOL isNeedUpdate) {
+ [strongSelf.resourceTableView reloadData];
+ }];
+ }
+ }];
+}
+
+- (void)endRefresh{
+ [self.resourceTableView.mj_header endRefreshing];
+}
+
+- (void)doPostLoginCV {
+ [[RulesManager sharedInstance] setDelegate:self];
+
+ /**
+ * It may not be a reliable way to do post login Client Verification.
+ * Maybe we should listen to the VPN_CB_CV_USER message.
+ */
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ RulesManager *manager = [RulesManager sharedInstance];
+ [manager cleanTimerRuleInteraction];
+ [manager kickoffTimerRules];
+ });
+
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)initKVOController {
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+#pragma mark - Access Mode
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ [cells addObject:[tableView cellForRowAtIndexPath:indexPath]];
+ }
+ }
+ return cells;
+}
+
+- (int)switchAccessMode:(NSString *)acsDesc {
+ int ret = ERROR_ACM_SUCCESS;
+ BOOL isMatchDesc = NO;
+
+ if ([self.acsDescList count] == [self.acsNameList count]) {
+ for (NSUInteger i =0; i < [self.acsDescList count]; i++) {
+ if ([[self.acsDescList objectAtIndex:i] isEqualToString:acsDesc]) {
+ isMatchDesc = YES;
+ ret = array_vpn_access_mode_set([[self.acsNameList objectAtIndex:i] UTF8String], NULL, NULL, 0);
+ break;
+ }
+ }
+ }
+
+ if (!isMatchDesc) {
+ ANError(@"switchAccessMode: get match access mode message failed, switch failed return error.");
+ ret = ERROR_ACM_UNDEFINE;
+ }
+
+ return ret;
+}
+
+- (void)accessModeRestartVPN{
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+}
+
+- (void)didFinishSelect:(NSString *)selectAcsDesc {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ NSString *currentAcsDesc = [cell getCellText];
+ if ([selectAcsDesc length] > 0) {
+ if ([currentAcsDesc isEqualToString:selectAcsDesc]) {
+ ANInfo(@"didFinishSelect: user select same access mode ,do nothing.");
+ } else {
+ ANInfo(@"didFinishSelect: user select access mode[%@]", selectAcsDesc);
+ [cell setCellText:selectAcsDesc];
+ [cell showActiveView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ int ret = [self switchAccessMode:selectAcsDesc];
+ NSString *errorMessage = nil;
+ switch (ret) {
+ case ERROR_ACM_SUCCESS:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ break;
+ case ERROR_ACM_SUCCESS_RECONN:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus == ArrayVPNConnected) {
+ ANInfo(@"didFinishSelect:vpn status is connected, need reconnect.");
+ self.needReconnect = YES;
+ [self stopVPN];
+ } else {
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+ break;
+ case ERROR_ACM_WITHOUT_SESSION:
+ errorMessage = NSLocalizedString(@"Switching failure: invalid user session. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_INVALID:
+ errorMessage = NSLocalizedString(@"Switching failure: illegal mode information. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_NONE:
+ errorMessage = NSLocalizedString(@"Switching failure: mode information does not exist. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_INVALID_PARAMETER:
+ errorMessage = NSLocalizedString(@"Switching failure: incorrect parameter. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_ACL_CHANGE_FAILED:
+ errorMessage = NSLocalizedString(@"Switching failure: the server fails to switch. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NETWORK:
+ errorMessage = NSLocalizedString(@"Switching failure: network error. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_UNDEFINE:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ default:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ }
+ if (errorMessage && errorMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error",nil) message:errorMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ [cell showActiveView:NO];
+ [cell setCellText:currentAcsDesc];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ for (NSString *info in self.acsDescList) {
+ if ([selectAcsDesc isEqualToString:info]) {
+ self.acsSelectedInfo = info;
+ }
+ }
+ }
+ ANInfo(@"didFinishSelect:switch access mode finished, select access mode=%@.", self.acsSelectedInfo);
+ });
+ }
+ }
+ }
+}
+
+#pragma mark - Auto Logout
+- (void)handleAutoLogout:(NSNotification *)notification {
+ [self logoutSilently];
+}
+
+- (void)clearCookies { // ANsession should be cleared on logout. (for WebAuth)
+#define MP_SESSION_PREFIX @"ANsession"
+#define MP_USERNAME_COOKIE @"username"
+#define MP_ACCESS_NAME @"acs_mode"
+#define MP_ACCESS_DESC @"acs_desc"
+
+ NSHTTPCookieStorage *cookieJar = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+ NSArray *cookies = cookieJar.cookies;
+ for (NSHTTPCookie *cookie in cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE] ||[cookie.name containsString:MP_SESSION_PREFIX] || [cookie.name containsString:MP_ACCESS_NAME] || [cookie.name containsString:MP_ACCESS_DESC]) {
+ [cookieJar deleteCookie:cookie];
+ }
+ }
+ }
+}
+
+#pragma mark - VPN Status
+#define STATUS_LABEL_COLOR_NORMAL UIColorFromRGBA(0x666666, 1.0)
+#define STATUS_LABEL_COLOR_WARNING UIColorFromRGBA(0xff0000, 1.0)
+#define STATUS_LABEL_COLOR_GREEN UIColorFromRGBA(0x42a009, 1.0)
+
+- (void)setVPNStatusAsConnecting {
+ self.activityIndicator.hidden = NO;
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Connecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNSStatusAsConnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_GREEN;
+ self.statusLabel.text = NSLocalizedString(@"Connected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectSuccess"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsDisconnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+ if (self.needReconnect) {
+ ANInfo(@"access mode disconnect vpn finished, now need restart vpn.");
+ self.needReconnect = NO;
+ [self accessModeRestartVPN];
+ }
+}
+
+- (void)setVPNStatusAsDisconnecting {
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsError:(NSString *)errorMessage {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_WARNING;
+ self.statusLabel.text = NSLocalizedString(@"Connect failed", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:errorMessage];
+}
+
+- (void)showMessageViewWithInfo:(NSString *)info {
+ if (info) {
+ self.messageLabel.text = info;
+ self.messageView.hidden = NO;
+ } else {
+ self.messageLabel.text = @"";
+ self.messageView.hidden = YES;
+ }
+}
+
+- (void)showEmptyResouceView {
+ self.emptyResourceView.hidden = NO;
+ self.resourceTableView.hidden = YES;
+ [self.view bringSubviewToFront:self.emptyResourceView];
+}
+
+- (void)showResourceTableView {
+ self.emptyResourceView.hidden = YES;
+ self.resourceTableView.hidden = NO;
+ [self.view bringSubviewToFront:self.resourceTableView];
+}
+
+#pragma mark - VPN Related
+- (BOOL)autoStartVPN {
+ BOOL isAutoStart = NO;
+ Gateway *gateway = [self getCurrentGateway];
+
+ if (!gateway) {
+ isAutoStart = YES;
+ ANInfo(@"No gateway is selected, it is auto start vpn.");
+ } else {
+ if (!gateway.isSecureTunnelEnabled) {
+ ANInfo(@"Auto start VPN is not enabled.");
+ return NO;
+ }
+ }
+
+ return [self startVPN:isAutoStart];
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameResource];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+
+ return YES;
+
+// if (isAutoStart) {
+// [vpnWrapper startSSLVPN];
+// }
+//
+// return [vpnWrapper validateSessionWithHost:gateway.host
+// port:gateway.port
+// session:session
+// completion:^(BOOL isSuccess, NSError *error) {
+// if (isSuccess) {
+// [vpnWrapper startSSLVPN];
+// } else {
+// NSString *message = NSLocalizedString(@"Session is invalid, please login again!", nil);
+// PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+// message:message
+// action:^{
+// [[NSNotificationCenter defaultCenter]
+// postNotificationName:kAutoLogoutNotification
+// object:nil];
+// }];
+// [self presentViewController:dialog animated:YES completion:nil];
+// }
+// }];
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+- (void)stopVPNAndLogout:(BOOL)isSilent {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{ // Stop timer rules fisrt.
+ [[RulesManager sharedInstance] stopAllRules];
+ });
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager continueVPNThreadWithAccount:nil];
+ [self stopVPN];
+
+ [self clearCookies];
+
+ if (!isSilent) {
+ __weak typeof(self) weakSelf = self;
+ [self.view makeToastActivity:CSToastPositionCenter];
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [[AAAManager sharedInstance] stopL3VPNDirectly];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [strongSelf.view hideToastActivity];
+ [strongSelf dismissViewControllerAnimated:YES completion:nil];
+ });
+ });
+ }
+}
+
+- (void)logoutSilently {
+ [self stopVPNAndLogout:YES];
+
+ [self.navigationController dismissViewControllerAnimated:NO completion:nil]; // Dismiss modal view if exists.
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (Gateway *)getCurrentGateway {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+#pragma mark - VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANDebug(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ [self updateUIWithVPNStatus:tunnelStatus];
+}
+
+- (void)updateUIWithVPNStatus:(ArrayVPNStatus)status {
+ switch (status) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnected:
+ [self setVPNStatusAsDisconnected];
+ break;
+ case ArrayVPNDisconnecting:
+ [self setVPNStatusAsDisconnecting];
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ [self setVPNStatusAsConnecting];
+ break;
+ case ArrayVPNConnected:
+ [self setVPNSStatusAsConnected];
+ break;
+
+ default:
+ break;
+ }
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+#pragma mark - Number of Sections & Rows
+- (BOOL)isWebAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isWebAppConfigured && self.model.webApps.children.count > 0;
+}
+
+- (BOOL)isNativeAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isNativeAppConfigured && self.model.nativeApps.children.count > 0;
+}
+
+- (BOOL)isDesktopToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isDesktopConfigured && self.model.desktopApps.resourceItems.count > 0;
+}
+
+- (NSInteger)totalSections {
+ NSInteger totalSections = 0;
+ NSInteger webSection = [self isWebAppToShow] ? 1 : 0;
+ NSInteger nativeSection = [self isNativeAppToShow] ? 1 : 0;
+ NSInteger desktopSection = [self isDesktopToShow] ? 1 : 0;
+
+ totalSections = webSection + nativeSection + desktopSection;
+
+ return totalSections;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToSubResource]) {
+ SubResourceViewController *viewController = segue.destinationViewController;
+ [viewController setupModel:(NSArray *)sender];
+ }
+ if ([segue.identifier isEqualToString:kSegueToAccessModeSelect]) {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ UINavigationController *navController = (UINavigationController *)segue.destinationViewController;
+ AccessModeSelectViewController *controller = (AccessModeSelectViewController *)navController.topViewController;
+ controller.selectedAcsModeString = self.acsSelectedInfo;
+ controller.delegate = self;
+ }
+ }
+}
+
+#pragma mark - Get Child at Index
+- (NSArray *)didSelectWebAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", row);
+ return nil;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ if (app.type == APP_TYPE_WEBAPP) {
+ ZTWKWebViewController *control = [[ZTWKWebViewController alloc] init];
+ control.webUrl = [app.url absoluteString];
+ [self.navigationController pushViewController:control animated:YES];
+
+
+ return nil;
+ }
+
+ return app.children;
+}
+
+- (NSArray *)didSelectNativeAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.nativeApps.children.count) {
+ ANError(@"Index (%zi) is out range of native apps count.", row);
+ return nil;
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ NSURL *url = [NSURL URLWithString:app.scheme];
+ if (url.scheme == nil) {
+ url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://", app.scheme]];
+ }
+
+ ANInfo(@"open app url=%@", url);
+ if (!OpenURL(url)) {
+ BOOL isAppStoreApp = (app.installUrl != nil);
+ if (!isAppStoreApp) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), app.name];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:@""
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [app.name stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else {
+ ANError(@"appstore client don't support this case any more.");
+ }
+ }
+
+ return nil;
+}
+
+- (NSArray *)didSelectDesktopAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.desktopApps.resourceItems.count) {
+ ANError(@"Index (%zi) is out range of desktop apps count.", row);
+ return nil;
+ }
+
+ FolderItem *item = [self.desktops objectAtIndex:row];
+ if ([item isKindOfClass:[GCustomItem class]] && [item.name isEqualToString:NSLocalizedString(@"Other", nil)]) {
+ [self performSegueWithIdentifier:kSegueToCustomDesktop sender:self];
+ return nil;
+ } else if ([item isKindOfClass:[HostItem class]]) {
+ [self didSelectHostItem:(HostItem *)item atIndexPath:indexPath];
+ return nil;
+ }
+
+ return [self getSortedArray:[item.resourceItems allValues]];
+}
+
+#pragma mark - DesktopDirect
+- (void)didSelectHostItem:(HostItem *)hostItem atIndexPath:(NSIndexPath *)indexPath {
+ if (self.currentIndex
+ && self.currentIndex.row == indexPath.row
+ && hostItem.status < ResourceStatusReady) {
+ return;
+ }
+
+ self.currentIndex = indexPath;
+ self.currentItem = hostItem;
+
+ ResourceCell *cell = (ResourceCell *)[self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ __weak typeof(self) weakSelf = self;
+ [self.kvoController observe:hostItem
+ keyPath:@"status"
+ options:NSKeyValueObservingOptionNew
+ block:^(ResourcesViewController *observer, HostItem *host, NSDictionary *change) {
+ NSInteger hostStatus = host.status;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [cell updateUI:host];
+ if (observer.currentIndex.row != indexPath.row) {
+ return;
+ }
+
+ if (observer.silence) {
+ return;
+ }
+ if (host.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:host];
+ } else {
+ [observer openRDClient:host];
+ }
+ // Reset power state
+ host.powerState = HostPowerStateDown;
+ return;
+ } else if (hostStatus >= ResourceStatusFailed && hostStatus < ResourceStatusResolveHostNameFailed) {
+ ANError(@"Cannot connect to remote host, error code: %zi", hostStatus);
+
+ if (hostStatus == ResourceStatusPowerDown) {
+ NSString *message = NSLocalizedString(@"It seems the remote host is turned off. Would you like to try and wake it up?", nil);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSInteger row = weakSelf.currentIndex.row;
+ HostItem *host = weakSelf.desktops[row];
+ [host wakeUp];
+ }
+ cancelAction:nil];
+
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ } else {
+ [observer.kvoController unobserve:host];
+ }
+ }
+ });
+ }];
+
+ [hostItem prepare];
+}
+
+- (void)openRDClient:(HostItem *)hostItem {
+ NSURL *url = hostItem.url;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD client"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [@"RD client" stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openRDClientNEC:(HostItem *)hostItem {
+ NSURL *url = hostItem.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil),@"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (NSArray *)desktops {
+ if (!_desktops) {
+ _desktops = [self getSortedArray:[self.model.desktopApps.resourceItems allValues]];
+ }
+
+ return _desktops;
+}
+
+- (NSArray *)getSortedArray:(NSArray *)array {
+ if (!array || array.count == 0) {
+ ANWarn(@"Empty array, should not be sorted.");
+ return nil;
+ }
+
+ NSSortDescriptor *byClass = [NSSortDescriptor sortDescriptorWithKey:@"class" ascending:YES comparator:^NSComparisonResult(id obj1, id obj2) {
+ // Sort by class name
+ return [NSStringFromClass(obj1) compare:NSStringFromClass(obj2)];
+
+ }];
+
+ NSSortDescriptor *byName = [NSSortDescriptor sortDescriptorWithKey:@"name"
+ ascending:YES
+ selector:@selector(localizedStandardCompare:)];
+
+ NSArray *sortDescriptors = [NSArray arrayWithObjects:byClass, byName, nil];
+
+ return [array sortedArrayUsingDescriptors:sortDescriptors];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return [self totalSections];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+ if (section > totalSections) {
+ ANError(@"Section (%zi) is larger than total sections (%zi).", section, totalSections);
+
+ return 0;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.webApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.nativeApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.desktopApps.resourceItems.count;
+ return [NSNumber numberWithInteger:rows];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (UITableViewCell *)configureWebAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ BOOL isFolder = app.type == APP_TYPE_FOLDER;
+ if (isFolder) {
+ image = [UIImage imageNamed:FOLDER_APP_IMAGE_NAME];
+ } else {
+ image = [UIImage imageNamed:WEB_APP_IMAGE_NAME];
+ UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+ action:@selector(cellLongPressed:)];
+ [cell addGestureRecognizer:longPressGesture];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureNativeAppWithRow:(NSInteger)row {
+ NativeAppCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kNativeAppCellID];
+ if (!cell) {
+ cell = [[NativeAppCell alloc] init];
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ if (app.customIcon) {
+ image = app.customIcon;
+ } else if (app.appIcon) {
+ image = app.appIcon;
+ } else {
+ image = [UIImage imageNamed:NATIVE_APP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:NO]; // Native app doesn't support folder.
+ [cell setDescriptionContent:app.desc];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureDesktopAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ ResourceItem *item = [self.desktops objectAtIndex:row];
+ BOOL isFolder = [item isKindOfClass:[FolderItem class]]; // Only pub-app & self-defined desktop has folder.
+ BOOL isCustomDesktop = [item isKindOfClass:[GCustomItem class]];
+ if (isCustomDesktop) {
+ isFolder = YES;
+ }
+ UIImage *image = nil;
+ if (item.icon != nil) {
+ if ([item.description containsString:@"http.ico"]) {
+ image = [UIImage imageNamed:ZRT_HTTP_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate1.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE1_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate2.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE2_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient1.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT1_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient2.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT2_IMAGE_NAME];
+ } else {
+ image = item.icon;
+ }
+ } else {
+ image = (isFolder && !isCustomDesktop) ? [UIImage imageNamed:FOLDER_APP_IMAGE_NAME] : [UIImage imageNamed:DESKTOP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:item.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger row = indexPath.row;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ __weak typeof(self) weakSelf = self;
+ cell = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:[NSNumber numberWithInteger:row]
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureWebAppWithRow:row];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureNativeAppWithRow:row];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureDesktopAppWithRow:row];
+ }];
+ } else if([tableView isEqual:self.acsModeTableView]) {
+ if ([self.acsDescList count] > 0) {
+ AccessModeCell *accessModeCell = [self.acsModeTableView dequeueReusableCellWithIdentifier:kAccessModeCellID];
+ if (!accessModeCell) {
+ accessModeCell = [[AccessModeCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kAccessModeCellID];
+ }
+ NSString *showAcsDesc = [self.acsDescList objectAtIndex:0];
+ if ([self.acsDescList count] > 1) {
+ showAcsDesc = [NSString stringWithFormat:@"%@...", showAcsDesc];
+ }
+
+ [accessModeCell configureCellWithMessage:showAcsDesc isDescList:NO];
+ [accessModeCell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+
+ return accessModeCell;
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ }
+
+ return cell;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ NSString *title = @"";
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+
+ title = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return NSLocalizedString(@"Web App", nil);
+ }
+ action2:^id(id param) {
+ return NSLocalizedString(@"Native App", nil);
+ }
+ action3:^id(id param) {
+ return NSLocalizedString(@"Remote Desktop", nil);
+ }];
+ }
+
+ return title;
+}
+
+#pragma mark - Long press handler for WebApp
+- (void)cellLongPressed:(UIGestureRecognizer *)recognizer {
+ if (recognizer.state == UIGestureRecognizerStateBegan) {
+ CGPoint location = [recognizer locationInView:self.resourceTableView];
+ NSIndexPath *indexPath = [self.resourceTableView indexPathForRowAtPoint:location];
+ _longPressedIndex = indexPath.row;
+ ResourceCell *cell = [self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ [self showMenuWithCell:cell];
+ }
+}
+
+- (void)showMenuWithCell:(ResourceCell *)cell {
+ [cell becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *openItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Open in Safari", nil) action:@selector(openWebPage:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:openItem, nil]];
+ [controller setTargetRect:cell.contentView.frame inView:cell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)openWebPage:(id)sender {
+ if (_longPressedIndex >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", _longPressedIndex);
+ return;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:_longPressedIndex];
+ if (app.type == APP_TYPE_WEBAPP) {
+ [[UIApplication sharedApplication] openURL:app.url];
+ }
+}
+
+#pragma mark - TimerRuleDelegate
+- (void)shouldSignOut {
+ [self logoutSilently];
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ [self.resourceTableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger totalSections = [self totalSections];
+ NSInteger section = indexPath.section;
+ NSArray *children = nil;
+
+ __weak typeof(self) weakSelf = self;
+ children = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:indexPath
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectWebAppAtIndexPath:indexPath];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectNativeAppAtIndexPath:indexPath];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectDesktopAtIndexPath:indexPath];
+ }];
+
+ if (children != nil) {
+ [self performSegueWithIdentifier:kSegueToSubResource sender:children];
+ }
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ [self.acsModeTableView deselectRowAtIndexPath:indexPath animated:YES];
+ if ([self.acsDescList count] > 0) {
+ [self performSegueWithIdentifier:kSegueToAccessModeSelect sender:self];
+ }
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return 39;
+ }
+
+ return 0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ static CGFloat kDefaultCellHeight = 44.0;
+ static CGFloat kNativeCellHeight = 66.0;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }
+ action2:^id(id param) {
+ return [NSNumber numberWithFloat:kNativeCellHeight];
+ }
+ action3:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 44;
+ }
+
+ return 0;
+}
+
+#pragma mark - Helper
+typedef id (^Action)(id param);
+
+- (id)getCellInfoInSection:(NSInteger)section
+ totalSection:(NSInteger)totalSection
+ object:(id)object
+ action1:(Action)action1
+ action2:(Action)action2
+ action3:(Action)action3 {
+ id result = nil;
+
+ switch (totalSection) {
+ case kResourceSectionOne: {
+ if ([self isWebAppToShow]) {
+ result = action1(object);
+ } else if ([self isNativeAppToShow]) {
+ result = action2(object);
+ } else if ([self isDesktopToShow]) {
+ result = action3(object);
+ }
+ break;
+ }
+ case kResourceSectionTwo:
+ if ([self isWebAppToShow]) {
+ if ([self isNativeAppToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ }
+ } else if ([self isDesktopToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ } else if ([self isNativeAppToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ break;
+ case kResourceSectionThree:
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex2) {
+ result = action3(object);
+ }
+ break;
+
+ default:
+ ANError(@"Invalid sections number of (%zi) received.", section);
+ break;
+ }
+
+ return result;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.MotionPro
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.MotionPro (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.MotionPro (working copy)
@@ -0,0 +1,1308 @@
+//
+// ResourcesViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "PubAppItem.h"
+#import "FBKVOController.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "GatewayManager.h"
+#import "CertificateManager.h"
+#import "ConfigurationManager.h"
+#import "RulesManager.h"
+#import "ResourceCell.h"
+#import "MJRefresh.h"
+#import "NativeAppCell.h"
+#import "AutoLoginHandler.h"
+#import "SubResourceViewController.h"
+#import "UIView+Toast.h"
+#import "ResourcesViewController.h"
+#import "AccessModeCell.h"
+#import "AccessModeSelectViewController.h"
+#import "ZTWKWebViewController.h"
+
+static NSString * const kSegueToSubResource = @"ResourceToSubResource";
+static NSString * const kSegueToCustomDesktop = @"ResourceToCustomDesktop";
+static NSString * const kSegueToAccessModeSelect = @"ResourceToAccessModeSelect";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameResource = @"group.net.arraynetworks.MotionPro";
+NSString * const kArrayVPNTunelErrorMsgResource = @"net.arraynetworks.sslvpn.errormsg";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameResource = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+typedef NS_ENUM(NSInteger, ResourceSectionNumber) {
+ kResourceSectionZero = 0,
+ kResourceSectionOne,
+ kResourceSectionTwo,
+ kResourceSectionThree
+};
+
+typedef NS_ENUM(NSInteger, ResourceSectionIndex) {
+ kResourceSectionIndex0 = 0,
+ kResourceSectionIndex1,
+ kResourceSectionIndex2
+};
+
+@interface ResourcesViewController () {
+ NSInteger _longPressedIndex;
+}
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+@property (weak, nonatomic) IBOutlet UISwitch *vpnEnableSwitch;
+@property (weak, nonatomic) IBOutlet UIImageView *statusImageView;
+
+@property (weak, nonatomic) IBOutlet UIView *messageView;
+@property (weak, nonatomic) IBOutlet UILabel *messageLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *emptyResourceView;
+@property (weak, nonatomic) IBOutlet UIImageView *emptyResourceImageView;
+@property (weak, nonatomic) IBOutlet UILabel *emptyResourceLabel;
+
+@property (weak, nonatomic) IBOutlet UITableView *resourceTableView;
+
+@property (weak, nonatomic) IBOutlet UITableView *acsModeTableView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *resourceViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *emptyViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageViewTopConstraint;
+
+@property (strong, nonatomic) AppManager *model;
+@property (strong, nonatomic) NSArray *desktops; // As a cache
+
+@property (strong, nonatomic) NSArray *acsDescList;
+@property (strong, nonatomic) NSArray *acsNameList;
+@property (strong, nonatomic) NSString *acsSelectedInfo;
+
+
+@property (strong, nonatomic) id browser;
+
+// For DesktopDirect
+@property (nonatomic, strong) NSIndexPath *currentIndex;
+@property (nonatomic, strong) ResourceItem *currentItem;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic) BOOL silence;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation ResourcesViewController
+
+@synthesize desktops = _desktops;
+
+- (void)dealloc {
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [AppManager sharedInstance];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleAutoLogout:)
+ name:kAutoLogoutNotification
+ object:nil];
+
+ [self setVPNStatusAsDisconnected];
+ [self autoStartVPN];
+ [self doPostLoginCV];
+
+ [self initKVOController];
+
+ [self initTopView];
+ [self initAccessModeView];
+ [self initPullToRefresh];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+
+ self.silence = YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.silence = NO;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+
+ RulesManager *manager = [RulesManager sharedInstance];
+ if (manager.didEndSession) {
+ manager.didEndSession = NO;
+
+ [self logoutSilently];
+ }
+}
+
+- (void)initAccessModeView {
+ BOOL bShowAcsModeView = NO;
+
+ self.acsSelectedInfo = nil;
+ self.acsDescList = [AAAManager sharedInstance].acsModeDesc;
+ self.acsNameList = [AAAManager sharedInstance].acsModeName;
+ if (self.acsDescList != nil) {
+ bShowAcsModeView = YES;
+ }
+
+ if (bShowAcsModeView) {
+ self.acsModeTableView.hidden = NO;
+ self.resourceViewTopConstraint.constant = 95;
+ self.emptyViewTopConstraint.constant = 100;
+ self.messageViewTopConstraint.constant = 100;
+ self.acsModeTableView.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0,0,0,0.01)];
+ } else {
+ self.acsModeTableView.hidden = YES;
+ self.resourceViewTopConstraint.constant = 45;
+ self.emptyViewTopConstraint.constant = 50;
+ self.messageViewTopConstraint.constant = 50;
+ }
+
+ self.needReconnect = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Would you like to sign out?", nil)
+ confirmAction:^{
+ [weakSelf stopVPNAndLogout:NO];
+ }
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (IBAction)vpnEnableSwitched:(id)sender {
+ if (self.vpnEnableSwitch.on) {
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+ } else {
+ [self stopVPN];
+ }
+}
+
+- (void)initTopView {
+ [self.acsModeTableView registerNib:[UINib nibWithNibName:@"AccessModeCell" bundle:nil] forCellReuseIdentifier:kAccessModeCellID];
+ if (self.model.isEmpty) {
+ [self showEmptyResouceView];
+ } else {
+ [self showResourceTableView];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"ResourceCell" bundle:nil] forCellReuseIdentifier:kResourceCellID];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"NativeAppCell" bundle:nil] forCellReuseIdentifier:kNativeAppCellID];
+ }
+}
+
+- (void)initPullToRefresh {
+ __weak typeof(self) weakSelf = self;
+ self.resourceTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ [strongSelf endRefresh];
+
+ Gateway *currentGateway = [self getCurrentGateway];
+ if (currentGateway) {
+ [[AppManager sharedInstance] fetchAppsFromServer:currentGateway.host
+ port:currentGateway.port
+ completion:^(BOOL isNeedUpdate) {
+ [strongSelf.resourceTableView reloadData];
+ }];
+ }
+ }];
+}
+
+- (void)endRefresh{
+ [self.resourceTableView.mj_header endRefreshing];
+}
+
+- (void)doPostLoginCV {
+ [[RulesManager sharedInstance] setDelegate:self];
+
+ /**
+ * It may not be a reliable way to do post login Client Verification.
+ * Maybe we should listen to the VPN_CB_CV_USER message.
+ */
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ RulesManager *manager = [RulesManager sharedInstance];
+ [manager cleanTimerRuleInteraction];
+ [manager kickoffTimerRules];
+ });
+
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)initKVOController {
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+#pragma mark - Access Mode
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ [cells addObject:[tableView cellForRowAtIndexPath:indexPath]];
+ }
+ }
+ return cells;
+}
+
+- (int)switchAccessMode:(NSString *)acsDesc {
+ int ret = ERROR_ACM_SUCCESS;
+ BOOL isMatchDesc = NO;
+
+ if ([self.acsDescList count] == [self.acsNameList count]) {
+ for (NSUInteger i =0; i < [self.acsDescList count]; i++) {
+ if ([[self.acsDescList objectAtIndex:i] isEqualToString:acsDesc]) {
+ isMatchDesc = YES;
+ ret = array_vpn_access_mode_set([[self.acsNameList objectAtIndex:i] UTF8String], NULL, NULL, 0);
+ break;
+ }
+ }
+ }
+
+ if (!isMatchDesc) {
+ ANError(@"switchAccessMode: get match access mode message failed, switch failed return error.");
+ ret = ERROR_ACM_UNDEFINE;
+ }
+
+ return ret;
+}
+
+- (void)accessModeRestartVPN{
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+}
+
+- (void)didFinishSelect:(NSString *)selectAcsDesc {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ NSString *currentAcsDesc = [cell getCellText];
+ if ([selectAcsDesc length] > 0) {
+ if ([currentAcsDesc isEqualToString:selectAcsDesc]) {
+ ANInfo(@"didFinishSelect: user select same access mode ,do nothing.");
+ } else {
+ ANInfo(@"didFinishSelect: user select access mode[%@]", selectAcsDesc);
+ [cell setCellText:selectAcsDesc];
+ [cell showActiveView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ int ret = [self switchAccessMode:selectAcsDesc];
+ NSString *errorMessage = nil;
+ switch (ret) {
+ case ERROR_ACM_SUCCESS:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ break;
+ case ERROR_ACM_SUCCESS_RECONN:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus == ArrayVPNConnected) {
+ ANInfo(@"didFinishSelect:vpn status is connected, need reconnect.");
+ self.needReconnect = YES;
+ [self stopVPN];
+ } else {
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+ break;
+ case ERROR_ACM_WITHOUT_SESSION:
+ errorMessage = NSLocalizedString(@"Switching failure: invalid user session. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_INVALID:
+ errorMessage = NSLocalizedString(@"Switching failure: illegal mode information. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_NONE:
+ errorMessage = NSLocalizedString(@"Switching failure: mode information does not exist. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_INVALID_PARAMETER:
+ errorMessage = NSLocalizedString(@"Switching failure: incorrect parameter. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_ACL_CHANGE_FAILED:
+ errorMessage = NSLocalizedString(@"Switching failure: the server fails to switch. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NETWORK:
+ errorMessage = NSLocalizedString(@"Switching failure: network error. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_UNDEFINE:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ default:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ }
+ if (errorMessage && errorMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error",nil) message:errorMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ [cell showActiveView:NO];
+ [cell setCellText:currentAcsDesc];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ for (NSString *info in self.acsDescList) {
+ if ([selectAcsDesc isEqualToString:info]) {
+ self.acsSelectedInfo = info;
+ }
+ }
+ }
+ ANInfo(@"didFinishSelect:switch access mode finished, select access mode=%@.", self.acsSelectedInfo);
+ });
+ }
+ }
+ }
+}
+
+#pragma mark - Auto Logout
+- (void)handleAutoLogout:(NSNotification *)notification {
+ [self logoutSilently];
+}
+
+- (void)clearCookies { // ANsession should be cleared on logout. (for WebAuth)
+#define MP_SESSION_PREFIX @"ANsession"
+#define MP_USERNAME_COOKIE @"username"
+#define MP_ACCESS_NAME @"acs_mode"
+#define MP_ACCESS_DESC @"acs_desc"
+
+ NSHTTPCookieStorage *cookieJar = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+ NSArray *cookies = cookieJar.cookies;
+ for (NSHTTPCookie *cookie in cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE] ||[cookie.name containsString:MP_SESSION_PREFIX] || [cookie.name containsString:MP_ACCESS_NAME] || [cookie.name containsString:MP_ACCESS_DESC]) {
+ [cookieJar deleteCookie:cookie];
+ }
+ }
+ }
+}
+
+#pragma mark - VPN Status
+#define STATUS_LABEL_COLOR_NORMAL UIColorFromRGBA(0x666666, 1.0)
+#define STATUS_LABEL_COLOR_WARNING UIColorFromRGBA(0xff0000, 1.0)
+#define STATUS_LABEL_COLOR_GREEN UIColorFromRGBA(0x42a009, 1.0)
+
+- (void)setVPNStatusAsConnecting {
+ self.activityIndicator.hidden = NO;
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Connecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNSStatusAsConnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_GREEN;
+ self.statusLabel.text = NSLocalizedString(@"Connected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectSuccess"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsDisconnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+ if (self.needReconnect) {
+ ANInfo(@"access mode disconnect vpn finished, now need restart vpn.");
+ self.needReconnect = NO;
+ [self accessModeRestartVPN];
+ }
+}
+
+- (void)setVPNStatusAsDisconnecting {
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsError:(NSString *)errorMessage {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_WARNING;
+ self.statusLabel.text = NSLocalizedString(@"Connect failed", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:errorMessage];
+}
+
+- (void)showMessageViewWithInfo:(NSString *)info {
+ if (info) {
+ self.messageLabel.text = info;
+ self.messageView.hidden = NO;
+ } else {
+ self.messageLabel.text = @"";
+ self.messageView.hidden = YES;
+ }
+}
+
+- (void)showEmptyResouceView {
+ self.emptyResourceView.hidden = NO;
+ self.resourceTableView.hidden = YES;
+ [self.view bringSubviewToFront:self.emptyResourceView];
+}
+
+- (void)showResourceTableView {
+ self.emptyResourceView.hidden = YES;
+ self.resourceTableView.hidden = NO;
+ [self.view bringSubviewToFront:self.resourceTableView];
+}
+
+#pragma mark - VPN Related
+- (BOOL)autoStartVPN {
+ BOOL isAutoStart = NO;
+ Gateway *gateway = [self getCurrentGateway];
+
+ if (!gateway) {
+ isAutoStart = YES;
+ ANInfo(@"No gateway is selected, it is auto start vpn.");
+ } else {
+ if (!gateway.isSecureTunnelEnabled) {
+ ANInfo(@"Auto start VPN is not enabled.");
+ return NO;
+ }
+ }
+
+ return [self startVPN:isAutoStart];
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameResource];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+
+ return YES;
+
+// if (isAutoStart) {
+// [vpnWrapper startSSLVPN];
+// }
+//
+// return [vpnWrapper validateSessionWithHost:gateway.host
+// port:gateway.port
+// session:session
+// completion:^(BOOL isSuccess, NSError *error) {
+// if (isSuccess) {
+// [vpnWrapper startSSLVPN];
+// } else {
+// NSString *message = NSLocalizedString(@"Session is invalid, please login again!", nil);
+// PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+// message:message
+// action:^{
+// [[NSNotificationCenter defaultCenter]
+// postNotificationName:kAutoLogoutNotification
+// object:nil];
+// }];
+// [self presentViewController:dialog animated:YES completion:nil];
+// }
+// }];
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+- (void)stopVPNAndLogout:(BOOL)isSilent {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{ // Stop timer rules fisrt.
+ [[RulesManager sharedInstance] stopAllRules];
+ });
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager continueVPNThreadWithAccount:nil];
+ [self stopVPN];
+
+ [self clearCookies];
+
+ if (!isSilent) {
+ __weak typeof(self) weakSelf = self;
+ [self.view makeToastActivity:CSToastPositionCenter];
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [[AAAManager sharedInstance] stopL3VPNDirectly];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [strongSelf.view hideToastActivity];
+ [strongSelf dismissViewControllerAnimated:YES completion:nil];
+ });
+ });
+ }
+}
+
+- (void)logoutSilently {
+ [self stopVPNAndLogout:YES];
+
+ [self.navigationController dismissViewControllerAnimated:NO completion:nil]; // Dismiss modal view if exists.
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (Gateway *)getCurrentGateway {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+#pragma mark - VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANDebug(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ [self updateUIWithVPNStatus:tunnelStatus];
+}
+
+- (void)updateUIWithVPNStatus:(ArrayVPNStatus)status {
+ switch (status) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnected:
+ [self setVPNStatusAsDisconnected];
+ break;
+ case ArrayVPNDisconnecting:
+ [self setVPNStatusAsDisconnecting];
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ [self setVPNStatusAsConnecting];
+ break;
+ case ArrayVPNConnected:
+ [self setVPNSStatusAsConnected];
+ break;
+
+ default:
+ break;
+ }
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+#pragma mark - Number of Sections & Rows
+- (BOOL)isWebAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isWebAppConfigured && self.model.webApps.children.count > 0;
+}
+
+- (BOOL)isNativeAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isNativeAppConfigured && self.model.nativeApps.children.count > 0;
+}
+
+- (BOOL)isDesktopToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isDesktopConfigured && self.model.desktopApps.resourceItems.count > 0;
+}
+
+- (NSInteger)totalSections {
+ NSInteger totalSections = 0;
+ NSInteger webSection = [self isWebAppToShow] ? 1 : 0;
+ NSInteger nativeSection = [self isNativeAppToShow] ? 1 : 0;
+ NSInteger desktopSection = [self isDesktopToShow] ? 1 : 0;
+
+ totalSections = webSection + nativeSection + desktopSection;
+
+ return totalSections;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToSubResource]) {
+ SubResourceViewController *viewController = segue.destinationViewController;
+ [viewController setupModel:(NSArray *)sender];
+ }
+ if ([segue.identifier isEqualToString:kSegueToAccessModeSelect]) {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ UINavigationController *navController = (UINavigationController *)segue.destinationViewController;
+ AccessModeSelectViewController *controller = (AccessModeSelectViewController *)navController.topViewController;
+ controller.selectedAcsModeString = self.acsSelectedInfo;
+ controller.delegate = self;
+ }
+ }
+}
+
+#pragma mark - Get Child at Index
+- (NSArray *)didSelectWebAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", row);
+ return nil;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ if (app.type == APP_TYPE_WEBAPP) {
+ ZTWKWebViewController *control = [[ZTWKWebViewController alloc] init];
+ control.webUrl = [app.url absoluteString];
+ [self.navigationController pushViewController:control animated:YES];
+
+
+ return nil;
+ }
+
+ return app.children;
+}
+
+- (NSArray *)didSelectNativeAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.nativeApps.children.count) {
+ ANError(@"Index (%zi) is out range of native apps count.", row);
+ return nil;
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ NSURL *url = [NSURL URLWithString:app.scheme];
+ if (url.scheme == nil) {
+ url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://", app.scheme]];
+ }
+
+ ANInfo(@"open app url=%@", url);
+ if (!OpenURL(url)) {
+ BOOL isAppStoreApp = (app.installUrl != nil);
+ if (!isAppStoreApp) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), app.name];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:@""
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [app.name stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else {
+ ANError(@"appstore client don't support this case any more.");
+ }
+ }
+
+ return nil;
+}
+
+- (NSArray *)didSelectDesktopAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.desktopApps.resourceItems.count) {
+ ANError(@"Index (%zi) is out range of desktop apps count.", row);
+ return nil;
+ }
+
+ FolderItem *item = [self.desktops objectAtIndex:row];
+ if ([item isKindOfClass:[GCustomItem class]] && [item.name isEqualToString:NSLocalizedString(@"Other", nil)]) {
+ [self performSegueWithIdentifier:kSegueToCustomDesktop sender:self];
+ return nil;
+ } else if ([item isKindOfClass:[HostItem class]]) {
+ [self didSelectHostItem:(HostItem *)item atIndexPath:indexPath];
+ return nil;
+ }
+
+ return [self getSortedArray:[item.resourceItems allValues]];
+}
+
+#pragma mark - DesktopDirect
+- (void)didSelectHostItem:(HostItem *)hostItem atIndexPath:(NSIndexPath *)indexPath {
+ if (self.currentIndex
+ && self.currentIndex.row == indexPath.row
+ && hostItem.status < ResourceStatusReady) {
+ return;
+ }
+
+ self.currentIndex = indexPath;
+ self.currentItem = hostItem;
+
+ ResourceCell *cell = (ResourceCell *)[self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ __weak typeof(self) weakSelf = self;
+ [self.kvoController observe:hostItem
+ keyPath:@"status"
+ options:NSKeyValueObservingOptionNew
+ block:^(ResourcesViewController *observer, HostItem *host, NSDictionary *change) {
+ NSInteger hostStatus = host.status;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [cell updateUI:host];
+ if (observer.currentIndex.row != indexPath.row) {
+ return;
+ }
+
+ if (observer.silence) {
+ return;
+ }
+ if (host.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:host];
+ } else {
+ [observer openRDClient:host];
+ }
+ // Reset power state
+ host.powerState = HostPowerStateDown;
+ return;
+ } else if (hostStatus >= ResourceStatusFailed && hostStatus < ResourceStatusResolveHostNameFailed) {
+ ANError(@"Cannot connect to remote host, error code: %zi", hostStatus);
+
+ if (hostStatus == ResourceStatusPowerDown) {
+ NSString *message = NSLocalizedString(@"It seems the remote host is turned off. Would you like to try and wake it up?", nil);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSInteger row = weakSelf.currentIndex.row;
+ HostItem *host = weakSelf.desktops[row];
+ [host wakeUp];
+ }
+ cancelAction:nil];
+
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ } else {
+ [observer.kvoController unobserve:host];
+ }
+ }
+ });
+ }];
+
+ [hostItem prepare];
+}
+
+- (void)openRDClient:(HostItem *)hostItem {
+ NSURL *url = hostItem.url;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD client"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [@"RD client" stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openRDClientNEC:(HostItem *)hostItem {
+ NSURL *url = hostItem.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil),@"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (NSArray *)desktops {
+ if (!_desktops) {
+ _desktops = [self getSortedArray:[self.model.desktopApps.resourceItems allValues]];
+ }
+
+ return _desktops;
+}
+
+- (NSArray *)getSortedArray:(NSArray *)array {
+ if (!array || array.count == 0) {
+ ANWarn(@"Empty array, should not be sorted.");
+ return nil;
+ }
+
+ NSSortDescriptor *byClass = [NSSortDescriptor sortDescriptorWithKey:@"class" ascending:YES comparator:^NSComparisonResult(id obj1, id obj2) {
+ // Sort by class name
+ return [NSStringFromClass(obj1) compare:NSStringFromClass(obj2)];
+
+ }];
+
+ NSSortDescriptor *byName = [NSSortDescriptor sortDescriptorWithKey:@"name"
+ ascending:YES
+ selector:@selector(localizedStandardCompare:)];
+
+ NSArray *sortDescriptors = [NSArray arrayWithObjects:byClass, byName, nil];
+
+ return [array sortedArrayUsingDescriptors:sortDescriptors];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return [self totalSections];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+ if (section > totalSections) {
+ ANError(@"Section (%zi) is larger than total sections (%zi).", section, totalSections);
+
+ return 0;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.webApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.nativeApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.desktopApps.resourceItems.count;
+ return [NSNumber numberWithInteger:rows];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (UITableViewCell *)configureWebAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ BOOL isFolder = app.type == APP_TYPE_FOLDER;
+ if (isFolder) {
+ image = [UIImage imageNamed:FOLDER_APP_IMAGE_NAME];
+ } else {
+ image = [UIImage imageNamed:WEB_APP_IMAGE_NAME];
+ UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+ action:@selector(cellLongPressed:)];
+ [cell addGestureRecognizer:longPressGesture];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureNativeAppWithRow:(NSInteger)row {
+ NativeAppCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kNativeAppCellID];
+ if (!cell) {
+ cell = [[NativeAppCell alloc] init];
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ if (app.customIcon) {
+ image = app.customIcon;
+ } else if (app.appIcon) {
+ image = app.appIcon;
+ } else {
+ image = [UIImage imageNamed:NATIVE_APP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:NO]; // Native app doesn't support folder.
+ [cell setDescriptionContent:app.desc];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureDesktopAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ ResourceItem *item = [self.desktops objectAtIndex:row];
+ BOOL isFolder = [item isKindOfClass:[FolderItem class]]; // Only pub-app & self-defined desktop has folder.
+ BOOL isCustomDesktop = [item isKindOfClass:[GCustomItem class]];
+ if (isCustomDesktop) {
+ isFolder = YES;
+ }
+ UIImage *image = nil;
+ if (item.icon != nil) {
+ if ([item.description containsString:@"http.ico"]) {
+ image = [UIImage imageNamed:ZRT_HTTP_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate1.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE1_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate2.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE2_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient1.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT1_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient2.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT2_IMAGE_NAME];
+ } else {
+ image = item.icon;
+ }
+ } else {
+ image = (isFolder && !isCustomDesktop) ? [UIImage imageNamed:FOLDER_APP_IMAGE_NAME] : [UIImage imageNamed:DESKTOP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:item.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger row = indexPath.row;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ __weak typeof(self) weakSelf = self;
+ cell = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:[NSNumber numberWithInteger:row]
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureWebAppWithRow:row];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureNativeAppWithRow:row];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureDesktopAppWithRow:row];
+ }];
+ } else if([tableView isEqual:self.acsModeTableView]) {
+ if ([self.acsDescList count] > 0) {
+ AccessModeCell *accessModeCell = [self.acsModeTableView dequeueReusableCellWithIdentifier:kAccessModeCellID];
+ if (!accessModeCell) {
+ accessModeCell = [[AccessModeCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kAccessModeCellID];
+ }
+ NSString *showAcsDesc = [self.acsDescList objectAtIndex:0];
+ if ([self.acsDescList count] > 1) {
+ showAcsDesc = [NSString stringWithFormat:@"%@...", showAcsDesc];
+ }
+
+ [accessModeCell configureCellWithMessage:showAcsDesc isDescList:NO];
+ [accessModeCell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+
+ return accessModeCell;
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ }
+
+ return cell;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ NSString *title = @"";
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+
+ title = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return NSLocalizedString(@"Web App", nil);
+ }
+ action2:^id(id param) {
+ return NSLocalizedString(@"Native App", nil);
+ }
+ action3:^id(id param) {
+ return NSLocalizedString(@"Remote Desktop", nil);
+ }];
+ }
+
+ return title;
+}
+
+#pragma mark - Long press handler for WebApp
+- (void)cellLongPressed:(UIGestureRecognizer *)recognizer {
+ if (recognizer.state == UIGestureRecognizerStateBegan) {
+ CGPoint location = [recognizer locationInView:self.resourceTableView];
+ NSIndexPath *indexPath = [self.resourceTableView indexPathForRowAtPoint:location];
+ _longPressedIndex = indexPath.row;
+ ResourceCell *cell = [self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ [self showMenuWithCell:cell];
+ }
+}
+
+- (void)showMenuWithCell:(ResourceCell *)cell {
+ [cell becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *openItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Open in Safari", nil) action:@selector(openWebPage:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:openItem, nil]];
+ [controller setTargetRect:cell.contentView.frame inView:cell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)openWebPage:(id)sender {
+ if (_longPressedIndex >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", _longPressedIndex);
+ return;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:_longPressedIndex];
+ if (app.type == APP_TYPE_WEBAPP) {
+ [[UIApplication sharedApplication] openURL:app.url];
+ }
+}
+
+#pragma mark - TimerRuleDelegate
+- (void)shouldSignOut {
+ [self logoutSilently];
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ [self.resourceTableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger totalSections = [self totalSections];
+ NSInteger section = indexPath.section;
+ NSArray *children = nil;
+
+ __weak typeof(self) weakSelf = self;
+ children = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:indexPath
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectWebAppAtIndexPath:indexPath];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectNativeAppAtIndexPath:indexPath];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectDesktopAtIndexPath:indexPath];
+ }];
+
+ if (children != nil) {
+ [self performSegueWithIdentifier:kSegueToSubResource sender:children];
+ }
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ [self.acsModeTableView deselectRowAtIndexPath:indexPath animated:YES];
+ if ([self.acsDescList count] > 0) {
+ [self performSegueWithIdentifier:kSegueToAccessModeSelect sender:self];
+ }
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return 39;
+ }
+
+ return 0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ static CGFloat kDefaultCellHeight = 44.0;
+ static CGFloat kNativeCellHeight = 66.0;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }
+ action2:^id(id param) {
+ return [NSNumber numberWithFloat:kNativeCellHeight];
+ }
+ action3:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 44;
+ }
+
+ return 0;
+}
+
+#pragma mark - Helper
+typedef id (^Action)(id param);
+
+- (id)getCellInfoInSection:(NSInteger)section
+ totalSection:(NSInteger)totalSection
+ object:(id)object
+ action1:(Action)action1
+ action2:(Action)action2
+ action3:(Action)action3 {
+ id result = nil;
+
+ switch (totalSection) {
+ case kResourceSectionOne: {
+ if ([self isWebAppToShow]) {
+ result = action1(object);
+ } else if ([self isNativeAppToShow]) {
+ result = action2(object);
+ } else if ([self isDesktopToShow]) {
+ result = action3(object);
+ }
+ break;
+ }
+ case kResourceSectionTwo:
+ if ([self isWebAppToShow]) {
+ if ([self isNativeAppToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ }
+ } else if ([self isDesktopToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ } else if ([self isNativeAppToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ break;
+ case kResourceSectionThree:
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex2) {
+ result = action3(object);
+ }
+ break;
+
+ default:
+ ANError(@"Invalid sections number of (%zi) received.", section);
+ break;
+ }
+
+ return result;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.MotionProEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.MotionProEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ResourcesViewController.m.MotionProEnterprise (working copy)
@@ -0,0 +1,1319 @@
+//
+// ResourcesViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "PubAppItem.h"
+#import "FBKVOController.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "GatewayManager.h"
+#import "CertificateManager.h"
+#import "ConfigurationManager.h"
+#import "RulesManager.h"
+#import "ResourceCell.h"
+#import "MJRefresh.h"
+#import "NativeAppCell.h"
+#import "AutoLoginHandler.h"
+#import "SubResourceViewController.h"
+#import "UIView+Toast.h"
+#import "ResourcesViewController.h"
+#import "AccessModeCell.h"
+#import "AccessModeSelectViewController.h"
+#import "ZTWKWebViewController.h"
+
+static NSString * const kSegueToSubResource = @"ResourceToSubResource";
+static NSString * const kSegueToCustomDesktop = @"ResourceToCustomDesktop";
+static NSString * const kSegueToAccessModeSelect = @"ResourceToAccessModeSelect";
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameResource = @"group.net.arraynetworks.groupenterprise";
+NSString * const kArrayVPNTunelErrorMsgResource = @"net.arraynetworks.sslvpn.errormsg";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameResource = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+typedef NS_ENUM(NSInteger, ResourceSectionNumber) {
+ kResourceSectionZero = 0,
+ kResourceSectionOne,
+ kResourceSectionTwo,
+ kResourceSectionThree
+};
+
+typedef NS_ENUM(NSInteger, ResourceSectionIndex) {
+ kResourceSectionIndex0 = 0,
+ kResourceSectionIndex1,
+ kResourceSectionIndex2
+};
+
+@interface ResourcesViewController () {
+ NSInteger _longPressedIndex;
+}
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+@property (weak, nonatomic) IBOutlet UISwitch *vpnEnableSwitch;
+@property (weak, nonatomic) IBOutlet UIImageView *statusImageView;
+
+@property (weak, nonatomic) IBOutlet UIView *messageView;
+@property (weak, nonatomic) IBOutlet UILabel *messageLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *emptyResourceView;
+@property (weak, nonatomic) IBOutlet UIImageView *emptyResourceImageView;
+@property (weak, nonatomic) IBOutlet UILabel *emptyResourceLabel;
+
+@property (weak, nonatomic) IBOutlet UITableView *resourceTableView;
+
+@property (weak, nonatomic) IBOutlet UITableView *acsModeTableView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *resourceViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *emptyViewTopConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageViewTopConstraint;
+
+@property (strong, nonatomic) AppManager *model;
+@property (strong, nonatomic) NSArray *desktops; // As a cache
+
+@property (strong, nonatomic) NSArray *acsDescList;
+@property (strong, nonatomic) NSArray *acsNameList;
+@property (strong, nonatomic) NSString *acsSelectedInfo;
+
+
+@property (strong, nonatomic) id browser;
+
+// For DesktopDirect
+@property (nonatomic, strong) NSIndexPath *currentIndex;
+@property (nonatomic, strong) ResourceItem *currentItem;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic) BOOL silence;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation ResourcesViewController
+
+@synthesize desktops = _desktops;
+
+- (void)dealloc {
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.model = [AppManager sharedInstance];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleAutoLogout:)
+ name:kAutoLogoutNotification
+ object:nil];
+
+ [self setVPNStatusAsDisconnected];
+ [self autoStartVPN];
+ [self doPostLoginCV];
+
+ [self initKVOController];
+
+ [self initTopView];
+ [self initAccessModeView];
+ [self initPullToRefresh];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+
+ self.silence = YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.silence = NO;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+
+ RulesManager *manager = [RulesManager sharedInstance];
+ if (manager.didEndSession) {
+ manager.didEndSession = NO;
+
+ [self logoutSilently];
+ }
+}
+
+- (void)initAccessModeView {
+ BOOL bShowAcsModeView = NO;
+
+ self.acsSelectedInfo = nil;
+ self.acsDescList = [AAAManager sharedInstance].acsModeDesc;
+ self.acsNameList = [AAAManager sharedInstance].acsModeName;
+ if (self.acsDescList != nil) {
+ bShowAcsModeView = YES;
+ }
+
+ if (bShowAcsModeView) {
+ self.acsModeTableView.hidden = NO;
+ self.resourceViewTopConstraint.constant = 95;
+ self.emptyViewTopConstraint.constant = 100;
+ self.messageViewTopConstraint.constant = 100;
+ self.acsModeTableView.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0,0,0,0.01)];
+ } else {
+ self.acsModeTableView.hidden = YES;
+ self.resourceViewTopConstraint.constant = 45;
+ self.emptyViewTopConstraint.constant = 50;
+ self.messageViewTopConstraint.constant = 50;
+ }
+
+ self.needReconnect = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)exitButtonClicked:(id)sender {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Would you like to sign out?", nil)
+ confirmAction:^{
+ [weakSelf stopVPNAndLogout:NO];
+ }
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (IBAction)vpnEnableSwitched:(id)sender {
+ if (self.vpnEnableSwitch.on) {
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+ } else {
+ [self stopVPN];
+ }
+}
+
+- (void)initTopView {
+ [self.acsModeTableView registerNib:[UINib nibWithNibName:@"AccessModeCell" bundle:nil] forCellReuseIdentifier:kAccessModeCellID];
+ if (self.model.isEmpty) {
+ [self showEmptyResouceView];
+ } else {
+ [self showResourceTableView];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"ResourceCell" bundle:nil] forCellReuseIdentifier:kResourceCellID];
+ [self.resourceTableView registerNib:[UINib nibWithNibName:@"NativeAppCell" bundle:nil] forCellReuseIdentifier:kNativeAppCellID];
+ }
+}
+
+- (void)initPullToRefresh {
+ __weak typeof(self) weakSelf = self;
+ self.resourceTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ [strongSelf endRefresh];
+
+ Gateway *currentGateway = [self getCurrentGateway];
+ if (currentGateway) {
+ [[AppManager sharedInstance] fetchAppsFromServer:currentGateway.host
+ port:currentGateway.port
+ completion:^(BOOL isNeedUpdate) {
+ [strongSelf.resourceTableView reloadData];
+ }];
+ }
+ }];
+}
+
+- (void)endRefresh{
+ [self.resourceTableView.mj_header endRefreshing];
+}
+
+- (void)doPostLoginCV {
+ [[RulesManager sharedInstance] setDelegate:self];
+
+ /**
+ * It may not be a reliable way to do post login Client Verification.
+ * Maybe we should listen to the VPN_CB_CV_USER message.
+ */
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ RulesManager *manager = [RulesManager sharedInstance];
+ [manager cleanTimerRuleInteraction];
+ [manager kickoffTimerRules];
+ });
+
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ [[RulesManager sharedInstance].interactionHandler takeAction];
+ });
+}
+
+- (void)initKVOController {
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+#pragma mark - Access Mode
+
+- (NSArray *)cellsForTableView:(UITableView *)tableView
+{
+ NSInteger sections = tableView.numberOfSections;
+ NSMutableArray *cells = [[NSMutableArray alloc] init];
+ for (int section = 0; section < sections; section++) {
+ NSInteger rows = [tableView numberOfRowsInSection:section];
+ for (int row = 0; row < rows; row++) {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+ [cells addObject:[tableView cellForRowAtIndexPath:indexPath]];
+ }
+ }
+ return cells;
+}
+
+- (int)switchAccessMode:(NSString *)acsDesc {
+ int ret = ERROR_ACM_SUCCESS;
+ BOOL isMatchDesc = NO;
+
+ if ([self.acsDescList count] == [self.acsNameList count]) {
+ for (NSUInteger i =0; i < [self.acsDescList count]; i++) {
+ if ([[self.acsDescList objectAtIndex:i] isEqualToString:acsDesc]) {
+ isMatchDesc = YES;
+ ret = array_vpn_access_mode_set([[self.acsNameList objectAtIndex:i] UTF8String], NULL, NULL, 0);
+ break;
+ }
+ }
+ }
+
+ if (!isMatchDesc) {
+ ANError(@"switchAccessMode: get match access mode message failed, switch failed return error.");
+ ret = ERROR_ACM_UNDEFINE;
+ }
+
+ return ret;
+}
+
+- (void)accessModeRestartVPN{
+ BOOL ret = [self startVPN:NO];
+ if (!ret) {
+ [self setVPNStatusAsError:NSLocalizedString(@"Can't start VPN.", nil)];
+ }
+
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+}
+
+- (void)didFinishSelect:(NSString *)selectAcsDesc {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ AccessModeCell *cell = (AccessModeCell *)[cells objectAtIndex:0];
+ NSString *currentAcsDesc = [cell getCellText];
+ if ([selectAcsDesc length] > 0) {
+ if ([currentAcsDesc isEqualToString:selectAcsDesc]) {
+ ANInfo(@"didFinishSelect: user select same access mode ,do nothing.");
+ } else {
+ ANInfo(@"didFinishSelect: user select access mode[%@]", selectAcsDesc);
+ [cell setCellText:selectAcsDesc];
+ [cell showActiveView:YES];
+ [cell setCellImage:ACCESS_MODE_IMAGE_INACTIVE_NAME];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ int ret = [self switchAccessMode:selectAcsDesc];
+ NSString *errorMessage = nil;
+ switch (ret) {
+ case ERROR_ACM_SUCCESS:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ break;
+ case ERROR_ACM_SUCCESS_RECONN:
+ ANInfo(@"didFinishSelect:switch access mode successfully.");
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus == ArrayVPNConnected) {
+ ANInfo(@"didFinishSelect:vpn status is connected, need reconnect.");
+ self.needReconnect = YES;
+ [self stopVPN];
+ } else {
+ [cell showActiveView:NO];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ }
+ break;
+ case ERROR_ACM_WITHOUT_SESSION:
+ errorMessage = NSLocalizedString(@"Switching failure: invalid user session. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_INVALID:
+ errorMessage = NSLocalizedString(@"Switching failure: illegal mode information. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NAME_NONE:
+ errorMessage = NSLocalizedString(@"Switching failure: mode information does not exist. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_INVALID_PARAMETER:
+ errorMessage = NSLocalizedString(@"Switching failure: incorrect parameter. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_ACL_CHANGE_FAILED:
+ errorMessage = NSLocalizedString(@"Switching failure: the server fails to switch. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_NETWORK:
+ errorMessage = NSLocalizedString(@"Switching failure: network error. Please switch again or contact the administrator.", nil);
+ break;
+ case ERROR_ACM_UNDEFINE:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ default:
+ errorMessage = NSLocalizedString(@"Switching failure: unknown error. Please switch again or contact the administrator.", nil);
+ break;
+ }
+ if (errorMessage && errorMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error",nil) message:errorMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ [cell showActiveView:NO];
+ [cell setCellText:currentAcsDesc];
+ [cell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+ } else {
+ for (NSString *info in self.acsDescList) {
+ if ([selectAcsDesc isEqualToString:info]) {
+ self.acsSelectedInfo = info;
+ }
+ }
+ }
+ ANInfo(@"didFinishSelect:switch access mode finished, select access mode=%@.", self.acsSelectedInfo);
+ });
+ }
+ }
+ }
+}
+
+#pragma mark - Auto Logout
+- (void)handleAutoLogout:(NSNotification *)notification {
+ [self logoutSilently];
+}
+
+- (void)clearCookies { // ANsession should be cleared on logout. (for WebAuth)
+#define MP_SESSION_PREFIX @"ANsession"
+#define MP_USERNAME_COOKIE @"username"
+#define MP_ACCESS_NAME @"acs_mode"
+#define MP_ACCESS_DESC @"acs_desc"
+
+ NSHTTPCookieStorage *cookieJar = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+ NSArray *cookies = cookieJar.cookies;
+ for (NSHTTPCookie *cookie in cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE] ||[cookie.name containsString:MP_SESSION_PREFIX] || [cookie.name containsString:MP_ACCESS_NAME] || [cookie.name containsString:MP_ACCESS_DESC]) {
+ [cookieJar deleteCookie:cookie];
+ }
+ }
+ }
+}
+
+#pragma mark - VPN Status
+#define STATUS_LABEL_COLOR_NORMAL UIColorFromRGBA(0x666666, 1.0)
+#define STATUS_LABEL_COLOR_WARNING UIColorFromRGBA(0xff0000, 1.0)
+#define STATUS_LABEL_COLOR_GREEN UIColorFromRGBA(0x42a009, 1.0)
+
+- (void)setVPNStatusAsConnecting {
+ self.activityIndicator.hidden = NO;
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Connecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNSStatusAsConnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_GREEN;
+ self.statusLabel.text = NSLocalizedString(@"Connected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectSuccess"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = YES;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsDisconnected {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnected", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+ if (self.needReconnect) {
+ ANInfo(@"access mode disconnect vpn finished, now need restart vpn.");
+ self.needReconnect = NO;
+ [self accessModeRestartVPN];
+ }
+}
+
+- (void)setVPNStatusAsDisconnecting {
+ [self.activityIndicator startAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_NORMAL;
+ self.statusLabel.text = NSLocalizedString(@"Disconnecting...", nil);
+ self.statusImageView.hidden = YES;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:nil];
+}
+
+- (void)setVPNStatusAsError:(NSString *)errorMessage {
+ [self.activityIndicator stopAnimating];
+ self.statusLabel.textColor = STATUS_LABEL_COLOR_WARNING;
+ self.statusLabel.text = NSLocalizedString(@"Connect failed", nil);
+ self.statusImageView.image = [UIImage imageNamed:@"ResourceConnectError"];
+ self.statusImageView.hidden = NO;
+ self.vpnEnableSwitch.on = NO;
+ [self showMessageViewWithInfo:errorMessage];
+}
+
+- (void)showMessageViewWithInfo:(NSString *)info {
+ if (info) {
+ self.messageLabel.text = info;
+ self.messageView.hidden = NO;
+ } else {
+ self.messageLabel.text = @"";
+ self.messageView.hidden = YES;
+ }
+}
+
+- (void)showEmptyResouceView {
+ self.emptyResourceView.hidden = NO;
+ self.resourceTableView.hidden = YES;
+ [self.view bringSubviewToFront:self.emptyResourceView];
+}
+
+- (void)showResourceTableView {
+ self.emptyResourceView.hidden = YES;
+ self.resourceTableView.hidden = NO;
+ [self.view bringSubviewToFront:self.resourceTableView];
+}
+
+#pragma mark - VPN Related
+- (BOOL)autoStartVPN {
+ BOOL isAutoStart = NO;
+ Gateway *gateway = [self getCurrentGateway];
+
+ if (!gateway) {
+ isAutoStart = YES;
+ ANInfo(@"No gateway is selected, it is auto start vpn.");
+ } else {
+ if (!gateway.isSecureTunnelEnabled) {
+ ANInfo(@"Auto start VPN is not enabled.");
+ return NO;
+ }
+ }
+
+ return [self startVPN:isAutoStart];
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameResource];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+#if TARGET_OS_IPHONE
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNTunnelError:)
+ name:kArrayVPNTunelErrorMsgResource object:nil];
+#endif
+
+ return YES;
+
+// if (isAutoStart) {
+// [vpnWrapper startSSLVPN];
+// }
+//
+// return [vpnWrapper validateSessionWithHost:gateway.host
+// port:gateway.port
+// session:session
+// completion:^(BOOL isSuccess, NSError *error) {
+// if (isSuccess) {
+// [vpnWrapper startSSLVPN];
+// } else {
+// NSString *message = NSLocalizedString(@"Session is invalid, please login again!", nil);
+// PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+// message:message
+// action:^{
+// [[NSNotificationCenter defaultCenter]
+// postNotificationName:kAutoLogoutNotification
+// object:nil];
+// }];
+// [self presentViewController:dialog animated:YES completion:nil];
+// }
+// }];
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+- (void)stopVPNAndLogout:(BOOL)isSilent {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{ // Stop timer rules fisrt.
+ [[RulesManager sharedInstance] stopAllRules];
+ });
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager continueVPNThreadWithAccount:nil];
+ [self stopVPN];
+
+ [self clearCookies];
+
+ if (!isSilent) {
+ __weak typeof(self) weakSelf = self;
+ [self.view makeToastActivity:CSToastPositionCenter];
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [[AAAManager sharedInstance] stopL3VPNDirectly];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [strongSelf.view hideToastActivity];
+ [strongSelf dismissViewControllerAnimated:YES completion:nil];
+ });
+ });
+ }
+}
+
+- (void)logoutSilently {
+ [self stopVPNAndLogout:YES];
+
+ [self.navigationController dismissViewControllerAnimated:NO completion:nil]; // Dismiss modal view if exists.
+ [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (Gateway *)getCurrentGateway {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+#pragma mark - VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANDebug(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ [self updateUIWithVPNStatus:tunnelStatus];
+}
+
+- (void)updateUIWithVPNStatus:(ArrayVPNStatus)status {
+ switch (status) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnected:
+ [self setVPNStatusAsDisconnected];
+ break;
+ case ArrayVPNDisconnecting:
+ [self setVPNStatusAsDisconnecting];
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ [self setVPNStatusAsConnecting];
+ break;
+ case ArrayVPNConnected:
+ [self setVPNSStatusAsConnected];
+ break;
+
+ default:
+ break;
+ }
+}
+
+- (void)handleVPNTunnelError:(NSNotification *)notification {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ NSString *errMessage = [vpnWrapper getErrorMsgWithCode];
+ if (errMessage && errMessage.length > 0) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING",nil) message:errMessage];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+#pragma mark - Number of Sections & Rows
+- (BOOL)isWebAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isWebAppConfigured && self.model.webApps.children.count > 0;
+}
+
+- (BOOL)isNativeAppToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isNativeAppConfigured && self.model.nativeApps.children.count > 0;
+}
+
+- (BOOL)isDesktopToShow {
+ PortalTabsConfiguration *portalConfiguration = [ConfigurationManager sharedInstance].portalTabs;
+
+ return portalConfiguration.isDesktopConfigured && self.model.desktopApps.resourceItems.count > 0;
+}
+
+- (NSInteger)totalSections {
+ NSInteger totalSections = 0;
+ NSInteger webSection = [self isWebAppToShow] ? 1 : 0;
+ NSInteger nativeSection = [self isNativeAppToShow] ? 1 : 0;
+ NSInteger desktopSection = [self isDesktopToShow] ? 1 : 0;
+
+ totalSections = webSection + nativeSection + desktopSection;
+
+ return totalSections;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ if ([segue.identifier isEqualToString:kSegueToSubResource]) {
+ SubResourceViewController *viewController = segue.destinationViewController;
+ [viewController setupModel:(NSArray *)sender];
+ }
+ if ([segue.identifier isEqualToString:kSegueToAccessModeSelect]) {
+ NSArray *cells = [self cellsForTableView:self.acsModeTableView];
+ if ([cells count] == 1) {
+ UINavigationController *navController = (UINavigationController *)segue.destinationViewController;
+ AccessModeSelectViewController *controller = (AccessModeSelectViewController *)navController.topViewController;
+ controller.selectedAcsModeString = self.acsSelectedInfo;
+ controller.delegate = self;
+ }
+ }
+}
+
+#pragma mark - Get Child at Index
+- (NSArray *)didSelectWebAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", row);
+ return nil;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ if (app.type == APP_TYPE_WEBAPP) {
+ ZTWKWebViewController *control = [[ZTWKWebViewController alloc] init];
+ control.webUrl = [app.url absoluteString];
+ [self.navigationController pushViewController:control animated:YES];
+
+
+ return nil;
+ }
+
+ return app.children;
+}
+
+- (NSArray *)didSelectNativeAppAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.nativeApps.children.count) {
+ ANError(@"Index (%zi) is out range of native apps count.", row);
+ return nil;
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ NSURL *url = [NSURL URLWithString:app.scheme];
+ if (url.scheme == nil) {
+ url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://", app.scheme]];
+ }
+
+ ANInfo(@"open app url=%@", url);
+ if (!OpenURL(url)) {
+ BOOL isAppStoreApp = (app.installUrl != nil);
+ if (!isAppStoreApp) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), app.name];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:@""
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [app.name stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ } else {
+ NSString *urlString = [NSString stringWithFormat:ITMS_SERVICE_PREFIX, app.installUrl];
+ ANInfo(@"Download app url=%@, scheme=%@", urlString, app.scheme);
+ if ([app.scheme containsString:@"voffice"]) {
+ urlString = @"http://app.arraynetworks.com.cn/voffice2";
+ }
+ if ([app.scheme containsString:@"zrOA"]) {
+ urlString = @"http://app.arraynetworks.com.cn/sufei";
+ }
+ if ([app.scheme containsString:@"zrlcsApp"]) {
+ urlString = @"http://app.arraynetworks.com.cn/staf";
+ }
+ OpenURL([NSURL URLWithString:urlString]); // Install directly from AG.
+ }
+ }
+
+ return nil;
+}
+
+- (NSArray *)didSelectDesktopAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = indexPath.row;
+
+ if (row >= self.model.desktopApps.resourceItems.count) {
+ ANError(@"Index (%zi) is out range of desktop apps count.", row);
+ return nil;
+ }
+
+ FolderItem *item = [self.desktops objectAtIndex:row];
+ if ([item isKindOfClass:[GCustomItem class]] && [item.name isEqualToString:NSLocalizedString(@"Other", nil)]) {
+ [self performSegueWithIdentifier:kSegueToCustomDesktop sender:self];
+ return nil;
+ } else if ([item isKindOfClass:[HostItem class]]) {
+ [self didSelectHostItem:(HostItem *)item atIndexPath:indexPath];
+ return nil;
+ }
+
+ return [self getSortedArray:[item.resourceItems allValues]];
+}
+
+#pragma mark - DesktopDirect
+- (void)didSelectHostItem:(HostItem *)hostItem atIndexPath:(NSIndexPath *)indexPath {
+ if (self.currentIndex
+ && self.currentIndex.row == indexPath.row
+ && hostItem.status < ResourceStatusReady) {
+ return;
+ }
+
+ self.currentIndex = indexPath;
+ self.currentItem = hostItem;
+
+ ResourceCell *cell = (ResourceCell *)[self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ __weak typeof(self) weakSelf = self;
+ [self.kvoController observe:hostItem
+ keyPath:@"status"
+ options:NSKeyValueObservingOptionNew
+ block:^(ResourcesViewController *observer, HostItem *host, NSDictionary *change) {
+ NSInteger hostStatus = host.status;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [cell updateUI:host];
+ if (observer.currentIndex.row != indexPath.row) {
+ return;
+ }
+
+ if (observer.silence) {
+ return;
+ }
+ if (host.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:host];
+ } else {
+ [observer openRDClient:host];
+ }
+ // Reset power state
+ host.powerState = HostPowerStateDown;
+ return;
+ } else if (hostStatus >= ResourceStatusFailed && hostStatus < ResourceStatusResolveHostNameFailed) {
+ ANError(@"Cannot connect to remote host, error code: %zi", hostStatus);
+
+ if (hostStatus == ResourceStatusPowerDown) {
+ NSString *message = NSLocalizedString(@"It seems the remote host is turned off. Would you like to try and wake it up?", nil);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSInteger row = weakSelf.currentIndex.row;
+ HostItem *host = weakSelf.desktops[row];
+ [host wakeUp];
+ }
+ cancelAction:nil];
+
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ } else {
+ [observer.kvoController unobserve:host];
+ }
+ }
+ });
+ }];
+
+ [hostItem prepare];
+}
+
+- (void)openRDClient:(HostItem *)hostItem {
+ NSURL *url = hostItem.url;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD client"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [@"RD client" stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openRDClientNEC:(HostItem *)hostItem {
+ NSURL *url = hostItem.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ if (!OpenURL(url)) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil),@"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (NSArray *)desktops {
+ if (!_desktops) {
+ _desktops = [self getSortedArray:[self.model.desktopApps.resourceItems allValues]];
+ }
+
+ return _desktops;
+}
+
+- (NSArray *)getSortedArray:(NSArray *)array {
+ if (!array || array.count == 0) {
+ ANWarn(@"Empty array, should not be sorted.");
+ return nil;
+ }
+
+ NSSortDescriptor *byClass = [NSSortDescriptor sortDescriptorWithKey:@"class" ascending:YES comparator:^NSComparisonResult(id obj1, id obj2) {
+ // Sort by class name
+ return [NSStringFromClass(obj1) compare:NSStringFromClass(obj2)];
+
+ }];
+
+ NSSortDescriptor *byName = [NSSortDescriptor sortDescriptorWithKey:@"name"
+ ascending:YES
+ selector:@selector(localizedStandardCompare:)];
+
+ NSArray *sortDescriptors = [NSArray arrayWithObjects:byClass, byName, nil];
+
+ return [array sortedArrayUsingDescriptors:sortDescriptors];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return [self totalSections];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+ if (section > totalSections) {
+ ANError(@"Section (%zi) is larger than total sections (%zi).", section, totalSections);
+
+ return 0;
+ }
+
+ __weak typeof(self) weakSelf = self;
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.webApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.nativeApps.children.count;
+ return [NSNumber numberWithInteger:rows];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger rows = strongSelf.model.desktopApps.resourceItems.count;
+ return [NSNumber numberWithInteger:rows];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 1;
+ }
+
+ return 0;
+}
+
+- (UITableViewCell *)configureWebAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ BOOL isFolder = app.type == APP_TYPE_FOLDER;
+ if (isFolder) {
+ image = [UIImage imageNamed:FOLDER_APP_IMAGE_NAME];
+ } else {
+ image = [UIImage imageNamed:WEB_APP_IMAGE_NAME];
+ UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+ action:@selector(cellLongPressed:)];
+ [cell addGestureRecognizer:longPressGesture];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureNativeAppWithRow:(NSInteger)row {
+ NativeAppCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kNativeAppCellID];
+ if (!cell) {
+ cell = [[NativeAppCell alloc] init];
+ }
+
+ NativeApp *app = [self.model.nativeApps.children objectAtIndex:row];
+ UIImage *image = nil;
+ if (app.customIcon) {
+ image = app.customIcon;
+ } else if (app.appIcon) {
+ image = app.appIcon;
+ } else {
+ image = [UIImage imageNamed:NATIVE_APP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:NO]; // Native app doesn't support folder.
+ [cell setDescriptionContent:app.desc];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureDesktopAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.resourceTableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ ResourceItem *item = [self.desktops objectAtIndex:row];
+ BOOL isFolder = [item isKindOfClass:[FolderItem class]]; // Only pub-app & self-defined desktop has folder.
+ BOOL isCustomDesktop = [item isKindOfClass:[GCustomItem class]];
+ if (isCustomDesktop) {
+ isFolder = YES;
+ }
+ UIImage *image = nil;
+ if (item.icon != nil) {
+ if ([item.description containsString:@"http.ico"]) {
+ image = [UIImage imageNamed:ZRT_HTTP_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate1.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE1_IMAGE_NAME];
+ } else if ([item.description containsString:@"HSValuate2.ico"]) {
+ image = [UIImage imageNamed:ZRT_HSVALUATE2_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient1.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT1_IMAGE_NAME];
+ } else if ([item.description containsString:@"fundclient2.ico"]) {
+ image = [UIImage imageNamed:ZRT_FUNDCLIENT2_IMAGE_NAME];
+ } else {
+ image = item.icon;
+ }
+ } else {
+ image = (isFolder && !isCustomDesktop) ? [UIImage imageNamed:FOLDER_APP_IMAGE_NAME] : [UIImage imageNamed:DESKTOP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:item.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger row = indexPath.row;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ __weak typeof(self) weakSelf = self;
+ cell = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:[NSNumber numberWithInteger:row]
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureWebAppWithRow:row];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureNativeAppWithRow:row];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ NSInteger row = [(NSNumber *)param integerValue];
+ return [strongSelf configureDesktopAppWithRow:row];
+ }];
+ } else if([tableView isEqual:self.acsModeTableView]) {
+ if ([self.acsDescList count] > 0) {
+ AccessModeCell *accessModeCell = [self.acsModeTableView dequeueReusableCellWithIdentifier:kAccessModeCellID];
+ if (!accessModeCell) {
+ accessModeCell = [[AccessModeCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kAccessModeCellID];
+ }
+ NSString *showAcsDesc = [self.acsDescList objectAtIndex:0];
+ if ([self.acsDescList count] > 1) {
+ showAcsDesc = [NSString stringWithFormat:@"%@...", showAcsDesc];
+ }
+
+ [accessModeCell configureCellWithMessage:showAcsDesc isDescList:NO];
+ [accessModeCell setCellImage:ACCESS_MODE_IMAGE_ACTIVE_NAME];
+
+ return accessModeCell;
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ }
+
+ return cell;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ NSString *title = @"";
+ if ([tableView isEqual:self.resourceTableView]) {
+ NSInteger totalSections = [self totalSections];
+
+ title = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return NSLocalizedString(@"Web App", nil);
+ }
+ action2:^id(id param) {
+ return NSLocalizedString(@"Native App", nil);
+ }
+ action3:^id(id param) {
+ return NSLocalizedString(@"Remote Desktop", nil);
+ }];
+ }
+
+ return title;
+}
+
+#pragma mark - Long press handler for WebApp
+- (void)cellLongPressed:(UIGestureRecognizer *)recognizer {
+ if (recognizer.state == UIGestureRecognizerStateBegan) {
+ CGPoint location = [recognizer locationInView:self.resourceTableView];
+ NSIndexPath *indexPath = [self.resourceTableView indexPathForRowAtPoint:location];
+ _longPressedIndex = indexPath.row;
+ ResourceCell *cell = [self.resourceTableView cellForRowAtIndexPath:indexPath];
+
+ [self showMenuWithCell:cell];
+ }
+}
+
+- (void)showMenuWithCell:(ResourceCell *)cell {
+ [cell becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *openItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Open in Safari", nil) action:@selector(openWebPage:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:openItem, nil]];
+ [controller setTargetRect:cell.contentView.frame inView:cell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)openWebPage:(id)sender {
+ if (_longPressedIndex >= self.model.webApps.children.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", _longPressedIndex);
+ return;
+ }
+
+ WebApp *app = [self.model.webApps.children objectAtIndex:_longPressedIndex];
+ if (app.type == APP_TYPE_WEBAPP) {
+ [[UIApplication sharedApplication] openURL:app.url];
+ }
+}
+
+#pragma mark - TimerRuleDelegate
+- (void)shouldSignOut {
+ [self logoutSilently];
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ [self.resourceTableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger totalSections = [self totalSections];
+ NSInteger section = indexPath.section;
+ NSArray *children = nil;
+
+ __weak typeof(self) weakSelf = self;
+ children = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:indexPath
+ action1:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectWebAppAtIndexPath:indexPath];
+ }
+ action2:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectNativeAppAtIndexPath:indexPath];
+ }
+ action3:^id(id param) {
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ return [strongSelf didSelectDesktopAtIndexPath:indexPath];
+ }];
+
+ if (children != nil) {
+ [self performSegueWithIdentifier:kSegueToSubResource sender:children];
+ }
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ [self.acsModeTableView deselectRowAtIndexPath:indexPath animated:YES];
+ if ([self.acsDescList count] > 0) {
+ [self performSegueWithIdentifier:kSegueToAccessModeSelect sender:self];
+ }
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ if ([tableView isEqual:self.resourceTableView]) {
+ return 39;
+ }
+
+ return 0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([tableView isEqual:self.resourceTableView]) {
+ static CGFloat kDefaultCellHeight = 44.0;
+ static CGFloat kNativeCellHeight = 66.0;
+ NSInteger section = indexPath.section;
+ NSInteger totalSections = [self totalSections];
+
+ NSNumber *result = [self getCellInfoInSection:section
+ totalSection:totalSections
+ object:nil
+ action1:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }
+ action2:^id(id param) {
+ return [NSNumber numberWithFloat:kNativeCellHeight];
+ }
+ action3:^id(id param) {
+ return [NSNumber numberWithFloat:kDefaultCellHeight];
+ }];
+
+ return [result integerValue];
+ } else if ([tableView isEqual:self.acsModeTableView]) {
+ return 44;
+ }
+
+ return 0;
+}
+
+#pragma mark - Helper
+typedef id (^Action)(id param);
+
+- (id)getCellInfoInSection:(NSInteger)section
+ totalSection:(NSInteger)totalSection
+ object:(id)object
+ action1:(Action)action1
+ action2:(Action)action2
+ action3:(Action)action3 {
+ id result = nil;
+
+ switch (totalSection) {
+ case kResourceSectionOne: {
+ if ([self isWebAppToShow]) {
+ result = action1(object);
+ } else if ([self isNativeAppToShow]) {
+ result = action2(object);
+ } else if ([self isDesktopToShow]) {
+ result = action3(object);
+ }
+ break;
+ }
+ case kResourceSectionTwo:
+ if ([self isWebAppToShow]) {
+ if ([self isNativeAppToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ }
+ } else if ([self isDesktopToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ } else if ([self isNativeAppToShow]) {
+ if ([self isDesktopToShow]) {
+ if (section == kResourceSectionIndex0) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action3(object);
+ }
+ }
+ }
+ break;
+ case kResourceSectionThree:
+ if (section == kResourceSectionIndex0) {
+ result = action1(object);
+ } else if (section == kResourceSectionIndex1) {
+ result = action2(object);
+ } else if (section == kResourceSectionIndex2) {
+ result = action3(object);
+ }
+ break;
+
+ default:
+ ANError(@"Invalid sections number of (%zi) received.", section);
+ break;
+ }
+
+ return result;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMSViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMSViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMSViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// SMSViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/28.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface SMSViewController : UIViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMSViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMSViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMSViewController.m (working copy)
@@ -0,0 +1,223 @@
+//
+// SMSViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/28.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "AAAManager.h"
+#import "ANPopupDialog.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "SMSViewController.h"
+
+#define TOTAL_SECTIONS 1
+#define TOTAL_ROWS 1
+
+static NSString * const kValidateCodeCellID = @"ValidateCodeCellID";
+static NSInteger const kTextFieldTag = 1;
+static NSInteger const kButtonTag = 2;
+static NSInteger kValidateCodeCellSection = 0;
+static NSInteger kValidateCodeCellRow = 0;
+
+static NSInteger const defaultResendInterval = 30;
+static NSInteger const defaultResendMax = 2;
+static NSInteger resendCount = 0;
+
+@interface SMSViewController ()
+
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@property (strong, nonatomic) UIButton *resendButton;
+
+@property (nonatomic) NSInteger resendInterval;
+@property (nonatomic, strong) NSTimer *timer;
+
+@end
+
+@implementation SMSViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+ [self initLoginButtonAppearance];
+}
+
+- (void)viewDidDisappear:(BOOL)animated {
+ [super viewDidDisappear:animated];
+
+ resendCount = 0;
+ [self stopTimer];
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+
+ [self countdownFromSecond:defaultResendInterval-1];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonClicked:(id)sender {
+ NSString *code = [self getValidateCodeTextField].text;
+ VPNAccount *account = [[VPNAccount alloc] init];
+ account.passWord = code;
+
+ [[AAAManager sharedInstance] continueVPNThreadWithSMSAccount:account];
+
+ [self stopTimer];
+ [self showLoginActivity:YES];
+}
+
+- (void)initResendButtonWithCell:(UITableViewCell *)cell {
+ if (!self.resendButton) {
+ self.resendButton = [cell viewWithTag:kButtonTag];
+ self.resendButton.layer.cornerRadius = 2.5;
+ self.resendButton.layer.borderWidth = 1.0;
+ self.resendButton.showsTouchWhenHighlighted = YES;
+ [self setResendButtonAsDisabledWithTitle:NSLocalizedString(@"Resend", nil)];
+
+ [self.resendButton addTarget:self action:@selector(resendButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+ }
+}
+
+- (void)resendButtonClicked:(id)sender {
+ AAAManager *manager = [AAAManager sharedInstance];
+
+ if (++resendCount > defaultResendMax) {
+ NSString *message = NSLocalizedString(@"Your attempt to sign in failed, because you have resent verification code for too many times.", nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:message];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [manager cancelLogin];
+
+ return;
+ }
+
+ [manager resendSMSVerificationCode];
+
+ [self getValidateCodeTextField].text = nil;
+ [self countdownFromSecond:defaultResendInterval];
+}
+
+- (IBAction)cancelButtonClicked:(id)sender {
+ [self showLoginActivity:NO];
+
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+- (void)stopTimer {
+ [self.timer invalidate];
+ self.timer = nil;
+}
+
+- (void)countdownInterval:(NSTimer *)timer {
+ self.resendInterval = _resendInterval - 1;
+ if (_resendInterval == 0) {
+ [timer invalidate];
+ self.timer = nil;
+ }
+}
+
+- (void)countdownFromSecond:(NSInteger)number {
+ self.resendInterval = number;
+
+ self.timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(countdownInterval:) userInfo:nil repeats:YES];
+}
+
+- (UITextField *)getValidateCodeTextField {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:kValidateCodeCellRow inSection:kValidateCodeCellSection];
+ UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
+
+ return (UITextField *)[cell viewWithTag:kTextFieldTag];
+}
+
+- (void)setResendInterval:(NSInteger)resendInterval {
+ NSString *buttonTitle = NSLocalizedString(@"Resend", @"Resend SMS Verification Code");
+
+ _resendInterval = resendInterval;
+
+ if (resendInterval == 0) {
+ [self setResendButtonAsNormalWithTitle:buttonTitle];
+ } else {
+ buttonTitle = [NSString stringWithFormat:@"%@(%zi)", buttonTitle, resendInterval];
+ [self setResendButtonAsDisabledWithTitle:buttonTitle];
+ }
+}
+
+- (void)setResendButtonAsNormalWithTitle:(NSString *)title {
+ self.resendButton.enabled = YES;
+ self.resendButton.layer.borderColor = MAIN_COLOR.CGColor;
+ [self.resendButton setTitle:title forState:UIControlStateNormal];
+ [self.resendButton setTitleColor:MAIN_COLOR forState:UIControlStateNormal];
+ [self.resendButton setTitleColor:UIColorFromRGBA(0x999999, 1.0) forState:UIControlStateHighlighted];
+}
+
+- (void)setResendButtonAsDisabledWithTitle:(NSString *)title {
+ self.resendButton.enabled = NO;
+ self.resendButton.layer.borderColor = UIColorFromRGBA(0x999999, 1.0).CGColor;
+ [self.resendButton setTitle:title forState:UIControlStateDisabled];
+ [self.resendButton setTitleColor:UIColorFromRGBA(0x999999, 1.0) forState:UIControlStateDisabled];
+}
+
+- (void)refreshView {
+ [self showLoginActivity:NO];
+
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@""
+ message:NSLocalizedString(@"The verification code is wrong, please enter the right one", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ [self getValidateCodeTextField].text = nil;
+ [self countdownFromSecond:defaultResendInterval];
+}
+
+- (void)initLoginButtonAppearance {
+ self.loginButton.layer.cornerRadius = 2.5;
+ self.loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ self.loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ self.loginButton.layer.shadowOpacity = 0.25;
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return TOTAL_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return TOTAL_ROWS;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ NSInteger section = indexPath.section;
+ NSInteger row = indexPath.row;
+ if (section == kValidateCodeCellSection && row == kValidateCodeCellRow) {
+ cell = [self.tableView dequeueReusableCellWithIdentifier:kValidateCodeCellID];
+ if (cell) {
+ [self initResendButtonWithCell:cell];
+ }
+ } else {
+ cell = [[UITableViewCell alloc] init];
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15.0;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SMXLoginViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SMXLoginViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SMXLoginViewController.h (working copy)
@@ -0,0 +1,28 @@
+//
+// SMXLoginViewController.h
+// MobileNow
+//
+// Created by array on 1/15/14.
+// Copyright (c) 2014 MobileNow. All rights reserved.
+//
+
+#import
+#import "SmxInfo.h"
+#import "AAAManager.h"
+
+@interface SmxLoginViewController : UIViewController
+@property (nonatomic, retain) SmxInfo* smxInfo;
+
+@property (strong, nonatomic) IBOutlet UILabel *matrixLabel;
+@property (strong, nonatomic) IBOutlet UITextField *passwdField;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *loginButton;
+
+- (IBAction)cancelLogin:(id)sender;
+- (IBAction)login:(id)sender;
+
+- (void)refreshView;
+- (NSString *)createMatrixText:(NSString *)matrixStr type:(int)type;
+- (VPNAccount *)accountWithPassword;
+- (void)refreshComponents;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SMXLoginViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SMXLoginViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SMXLoginViewController.m (working copy)
@@ -0,0 +1,158 @@
+//
+// SMXLoginViewController.m
+// MobileNow
+//
+// Created by array on 1/15/14.
+// Copyright (c) 2014 MobileNow. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "ANPopupDialog.h"
+#import "UIViewController+Activity.h"
+#import "UIViewController+HideKeyboard.h"
+#import "SMXLoginViewController.h"
+
+@interface SmxLoginViewController ()
+@end
+
+@implementation SmxLoginViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self initSmxInfo];
+ [self refreshComponents];
+ [self enableHideKeyboard];
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info == NULL || smx_info->action == SMX_ACTION_INPUT_PASS) {
+ self.title = NSLocalizedString(@"Password", @"");
+ } else if(smx_info->action == SMX_ACTION_INPUT_OLD_PASS) {
+ self.title = NSLocalizedString(@"Change Password", @"");
+ self.passwdField.placeholder = NSLocalizedString(@"Current Password", @"");
+ self.navigationItem.rightBarButtonItem.title = NSLocalizedString(@"Next", @"");
+ }
+}
+
+- (void)refreshComponents {
+ if (self.smxInfo == nil) {
+ return;
+ }
+
+ NSString *matrixStr = [[NSString alloc] initWithString:[self.smxInfo generateMatrixStr]];
+
+ if (matrixStr && [matrixStr length] == 16*self.smxInfo.boxcount) {
+ self.matrixLabel.text = [self createMatrixText:matrixStr type:(int)self.smxInfo.boxcount];
+ } else {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"An unexpected error occured.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)initSmxInfo {
+ AAAManager *manager = [AAAManager sharedInstance];
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ VPNAccount *account = manager.account;
+
+ self.smxInfo = [[SmxInfo alloc] initWithVpnSmxInfo:smx_info user:account.userName];
+}
+
+- (void)updateSmxInfo {
+ AAAManager *manager = [AAAManager sharedInstance];
+ vpn_smx_info_t *smx_info = manager.smx_info;
+
+ [self.smxInfo updateVpnSmxInfo:smx_info];
+}
+
+- (NSString *)createMatrixText:(NSString *)matrixStr type:(int)type {
+ if (type != 3 && type != 4) {
+ ANError(@"unknow Matrix type %d!", type);
+ return nil;
+ }
+
+ NSMutableString *matrix = [[NSMutableString alloc] init];
+ NSRange range;
+ for (int j=0; j<4; j++) {
+ int start = j*4;
+ int end = start + type*16;
+ for (int i=start; i
+
+#define ARP_SMX_MAXNO @"maxNo"
+#define ARP_SMX_CONF @"conf"
+#define ARP_SMX_CHECK @"check"
+#define ARP_SMX_RECPNO @"RecpNo"
+#define ARP_SMX_NEXT @"Next"
+#define ARP_SMX_POSPWD @"PosPwd"
+#define ARP_SMX_AUTHCODE @"authCode"
+#define ARP_SMX_RESULT @"Result"
+#define ARP_SMX_ERRORMSG @"ErrorMsg"
+#define SMX_COPYRIGHT_STRING @"Copyright(C) 2013 CSE Co.,Ltd. All rights reserved."
+
+extern NSString *const SmxClientAPIErrorDomain;
+extern char const SmxClientAPIMatrixPatternSeparator;
+
+typedef enum _SmxClientAPIError {
+ SmxClientAPIErrorGenMatrixLoginId = 0x80000001,
+ SmxClientAPIErrorGenMatrixMxNo = 0x80000002,
+ SmxClientAPIErrorGenMatrixConf = 0x80000003,
+ SmxClientAPIErrorGenMatrixCheck = 0x80000004,
+ SmxClientAPIErrorGenMatrixFailed = 0x80000006,
+
+ SmxClientAPIErrorGenChangeMatrixLoginId = 0x80000001,
+ SmxClientAPIErrorGenChangeMatrixMxNo = 0x80000002,
+ SmxClientAPIErrorGenChangeMatrixConf = 0x80000003,
+ SmxClientAPIErrorGenChangeMatrixCheck = 0x80000004,
+ SmxClientAPIErrorGenChangeMatrixFailed = 0x80000006,
+ SmxClientAPIErrorGenChangeMatrixCreate = 0x80000007,
+
+ SmxClientAPIErrorGetHashPassword = 0x80000001,
+ SmxClientAPIErrorGetHashFailed = 0x80000003,
+ SmxClientAPIErrorGetHashChallengeCode = 0x80000004
+} SmxClientAPIError;
+
+@interface SmxClientAPI : NSObject {
+ @private
+ NSString *SmxClientChallengeCode_;
+}
+
+- (NSString *)genMatrix:(NSString *)loginId mxNo:(NSString *)mxNo conf:(NSInteger)conf check:(NSString *)check error:(NSError **)error;
+- (NSString *)genChangeMatrix:(NSString *)loginId mxNo:(NSString *)mxNo conf:(NSInteger)conf check:(NSString *)check error:(NSError **)error;
+- (NSString *)getHash:(NSString *)password error:(NSError **)error;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxConfirmPasswordViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxConfirmPasswordViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxConfirmPasswordViewController.h (working copy)
@@ -0,0 +1,16 @@
+//
+// SmxConfirmPasswordViewController.h
+// MobileNow
+//
+// Created by array on 2/19/14.
+// Copyright (c) 2014 MobileNow. All rights reserved.
+//
+
+#import
+#import "SMXLoginViewController.h"
+
+@interface SmxConfirmPasswordViewController : SmxLoginViewController
+
+@property (strong, nonatomic) IBOutlet UILabel *passwdConfirm;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxConfirmPasswordViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxConfirmPasswordViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxConfirmPasswordViewController.m (working copy)
@@ -0,0 +1,91 @@
+//
+// SmxConfirmPasswordViewController.m
+// MobileNow
+//
+// Created by array on 2/19/14.
+// Copyright (c) 2014 MobileNow. All rights reserved.
+//
+
+#import "AAAManager.h"
+#import "SmxConfirmPasswordViewController.h"
+
+@interface SmxConfirmPasswordViewController ()
+
+@end
+
+@implementation SmxConfirmPasswordViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+#define SMX_POS_PWD_KEY_F 'F'
+#define SMX_POS_PWD_KEY_P 'P'
+
+- (void)refreshComponents {
+ NSString *srt = [self.smxInfo pospass] ?: @"";
+ NSString *pospass = [[NSString alloc] initWithString:srt];
+ NSInteger type = self.smxInfo.boxcount;
+
+ if (pospass.length < 2) {
+ self.passwdConfirm.text = @"";
+ self.matrixLabel.text = @"";
+ return;
+ }
+
+ NSMutableString *matrixStr = [[NSMutableString alloc] initWithCapacity:16*type];
+ NSMutableString *confirmStr = [[NSMutableString alloc] initWithCapacity:5];
+
+ for (int i=0; i<16*type; i++) {
+ [matrixStr appendString:@"0"];
+ }
+
+ NSInteger i = 0;
+ NSInteger matrixIndex = 1;
+ unichar c;
+
+ while (i < pospass.length) {
+ c = [pospass characterAtIndex:i];
+ if (c == SMX_POS_PWD_KEY_F) {
+ [confirmStr appendString:[NSString stringWithFormat:@"%c", [pospass characterAtIndex:i+1]]];
+ i += 2;
+ } else if (c == SMX_POS_PWD_KEY_P) {
+ NSString *strIndex = [pospass substringWithRange:NSMakeRange(i+1, 2)];
+ NSInteger index = [strIndex integerValue];
+ NSString *value = [NSString stringWithFormat:@"%zi", matrixIndex];
+ [matrixStr replaceCharactersInRange:NSMakeRange(index, 1) withString:value];
+ matrixIndex++;
+
+ [confirmStr appendString:@"*"];
+ i += 3;
+ }
+ };
+
+ self.matrixLabel.text = [self createMatrixText:matrixStr type:(int)type];
+ self.passwdConfirm.text = confirmStr;
+}
+
+- (VPNAccount*)accountWithPassword {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ if (account == nil) {
+ account = [[VPNAccount alloc] init];
+ }
+
+ [manager continueVPNThreadWithAccount:account];
+ return account;
+}
+
+- (IBAction)login:(id)sender {
+ [super login:sender];
+
+ [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxInfo.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxInfo.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxInfo.h (working copy)
@@ -0,0 +1,26 @@
+//
+// SmxInfo.h
+// MobileNow
+//
+// Created by Bryan Yuan on 11/3/13.
+// Copyright (c) 2013 MobileNow. All rights reserved.
+//
+
+#import
+#import "arrayapi.h"
+#import "SmxClientAPI.h"
+
+@interface SmxInfo : NSObject
+
+@property (nonatomic, retain) SmxClientAPI *smx_;
+@property (nonatomic, assign) NSInteger boxcount;
+@property (nonatomic, retain) NSString *matrixres;
+@property (nonatomic, retain) NSString *pospass;
+
+- (NSString *)generateMatrixStr;
+- (NSString *)generateChangeMatrixStr;
+- (NSString *) generateHash:(NSString *)pwd;
+- (instancetype)initWithVpnSmxInfo:(vpn_smx_info_t *)smx_info user:(NSString *)username;
+- (void)updateVpnSmxInfo:(vpn_smx_info_t *)smx_info;
+- (void)updateUsername:(NSString *)username;
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxInfo.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxInfo.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxInfo.m (working copy)
@@ -0,0 +1,108 @@
+//
+// SmxInfo.m
+// MobileNow
+//
+// Created by Bryan Yuan on 11/3/13.
+// Copyright (c) 2013 MobileNow. All rights reserved.
+//
+
+#import "SmxInfo.h"
+
+@interface SmxInfo () {
+}
+
+@property (nonatomic, retain) NSString *loginId_;
+
+@property (assign) vpn_smx_action_t action;
+@property (nonatomic, retain) NSString *charcheck;
+@property (nonatomic, retain) NSString *recpno;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSString *errmsg;
+
+@end
+
+@implementation SmxInfo
+
+@synthesize smx_;
+@synthesize loginId_;
+
+@synthesize boxcount;
+@synthesize charcheck;
+@synthesize recpno;
+@synthesize matrixres;
+@synthesize pospass;
+@synthesize title;
+@synthesize errmsg;
+
+- (instancetype)init {
+ self = [super init];
+ if(self)
+ {
+ self.smx_ = [[SmxClientAPI alloc] init];
+ }
+
+ return self;
+}
+- (instancetype)initWithVpnSmxInfo:(vpn_smx_info_t *)smx_info user:(NSString *)username {
+ self = [super init];
+ if (self) {
+ self.smx_ = [[SmxClientAPI alloc] init];
+
+ self->matrixres = [NSString stringWithUTF8String:smx_info->matrixres];
+ self->charcheck = [NSString stringWithUTF8String:smx_info->charcheck];
+ self->recpno = [NSString stringWithUTF8String:smx_info->recpno];
+ self->boxcount = [[NSString stringWithUTF8String:smx_info->boxcount] integerValue];
+ self->pospass = [NSString stringWithUTF8String:smx_info->pospass];
+ self->loginId_ = username;
+ self->errmsg = [NSString stringWithUTF8String:smx_info->errmsg];
+ }
+
+ return self;
+}
+
+- (void)updateVpnSmxInfo:(vpn_smx_info_t *)smx_info {
+ self->matrixres = [NSString stringWithUTF8String:smx_info->matrixres];
+ self->charcheck = [NSString stringWithUTF8String:smx_info->charcheck];
+ self->recpno = [NSString stringWithUTF8String:smx_info->recpno];
+ self->boxcount = [[NSString stringWithUTF8String:smx_info->boxcount] integerValue];
+ self->errmsg = [NSString stringWithUTF8String:smx_info->errmsg];
+}
+
+- (void)updateUsername:(NSString *)username {
+ self->loginId_ = username;
+}
+
+- (NSString *)generateMatrixStr {
+ NSError *error = nil;
+ NSString *matrixStr = [self.smx_ genMatrix:self.loginId_ mxNo:self->matrixres conf:self->boxcount check:self->charcheck error:&error];
+ if(error) {
+ return nil;
+ }
+ NSLog(@"matrixStr: %@", matrixStr);
+
+ return [[NSString alloc] initWithString:matrixStr];
+}
+
+- (NSString *)generateChangeMatrixStr {
+ NSError *error = nil;
+
+ NSString *matrixStr = [smx_ genChangeMatrix:self.loginId_ mxNo:self->matrixres conf:self->boxcount check:self->charcheck error:&error];
+ if(error) {
+ return nil;
+ }
+
+ return matrixStr;
+}
+
+- (NSString *)generateHash:(NSString *)pwd {
+ NSError *error = nil;
+ NSString *hashedMatrixStr = [self.smx_ getHash:pwd error:&error];
+
+ if(error) {
+ return nil;
+ }
+
+ return hashedMatrixStr;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxNewPasswordViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxNewPasswordViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxNewPasswordViewController.h (working copy)
@@ -0,0 +1,16 @@
+//
+// SmxNewPasswordViewController.h
+// MobileNow
+//
+// Created by array on 2/19/14.
+// Copyright (c) 2014 MobileNow. All rights reserved.
+//
+
+#import "SMXLoginViewController.h"
+
+@interface SmxNewPasswordViewController : SmxLoginViewController
+
+@property (strong, nonatomic) IBOutlet UILabel *matrixLabel2;
+@property (strong, nonatomic) IBOutlet UITextField *passwdField2;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxNewPasswordViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxNewPasswordViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SMX/SmxNewPasswordViewController.m (working copy)
@@ -0,0 +1,125 @@
+//
+// SmxNewPasswordViewController.m
+// MobileNow
+//
+// Created by array on 2/19/14.
+// Copyright (c) 2014 MobileNow. All rights reserved.
+//
+
+#import "AAAManager.h"
+#import "ANPopupDialog.h"
+#import "UIViewController+HideKeyboard.h"
+#import "SmxNewPasswordViewController.h"
+
+@interface SmxNewPasswordViewController ()
+
+@property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
+
+@end
+
+@implementation SmxNewPasswordViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self enableHideKeyboard];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+}
+
+- (void)viewDidLayoutSubviews {
+ [super viewDidLayoutSubviews];
+
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+ //We need to add an scroll view for iPhone.
+ [self.scrollView setContentSize:CGSizeMake(320, 500)];
+ }
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if ([textField returnKeyType] == UIReturnKeyDone) {
+ [self login:nil];
+ } else if ([textField returnKeyType] == UIReturnKeyNext) {
+ [self.passwdField2 becomeFirstResponder];
+ return NO;
+ }
+
+ return YES;
+}
+
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+ if (textField == _passwdField2) {
+ [self.scrollView setContentOffset:CGPointMake(0, 106) animated:YES];
+ } else {
+ [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES];
+ }
+ }
+ return YES;
+}
+
+
+- (void)refreshComponents {
+ if (self.smxInfo == nil) {
+ return;
+ }
+
+ self.passwdField.text = @"";
+ self.passwdField2.text = @"";
+
+ NSString *matrixStr = [[NSString alloc] initWithString:[self.smxInfo generateChangeMatrixStr]];
+ NSRange range;
+ NSInteger type = self.smxInfo.boxcount;
+
+ if (matrixStr && [matrixStr length] == 2*16*type+1) {
+ range.location = 0;
+ range.length = 16*self.smxInfo.boxcount;
+ self.matrixLabel.text = [self createMatrixText:[matrixStr substringWithRange:range] type:(int)type];
+ range.location += range.length+1;
+ self.matrixLabel2.text = [self createMatrixText:[matrixStr substringWithRange:range] type:(int)type];
+ } else {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:NSLocalizedString(@"An unexpected error occured.", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+
+ [self.passwdField becomeFirstResponder];
+}
+
+- (VPNAccount *)accountWithPassword {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account;
+ if (manager.account == nil) {
+ account = [[VPNAccount alloc] init];
+ } else {
+ account = [manager.account copy];
+ }
+
+ NSString *passwd1 = [self.passwdField.text stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@" "]];
+ NSString *passwd2 = [self.passwdField2.text stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@" "]];
+
+ if ((passwd1 != nil && [passwd1 length] == 0) || (passwd2 != nil && [passwd2 length] == 0)) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Please input password!", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return nil;
+ }
+
+ if ([passwd1 length] != [passwd2 length]) {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Please check your password!", nil)];
+ [self presentViewController:dialog animated:YES completion:nil];
+
+ return nil;
+ }
+
+ account.passWord = passwd1;
+ account.passWord2 = passwd2;
+
+ return account;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SettingsViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SettingsViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SettingsViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// SettingsViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface SettingsViewController : UITableViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SettingsViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SettingsViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SettingsViewController.m (working copy)
@@ -0,0 +1,567 @@
+//
+// SettingsViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "ANLogger.h"
+#import "AAAManager.h"
+#import "ANPopupDialog.h"
+#import "InformationToSave.h"
+#import "ArrayVPNWrapper.h"
+#import "ActionSheetPicker.h"
+#import "ConfigurationManager.h"
+#import "RulesManager.h"
+#import "UIView+Toast.h"
+#import "SettingsViewController.h"
+#import "GatewayModel.h"
+#import "BioAuth.h"
+#import "SetupGestureViewController.h"
+#import "Global.h"
+#import "Singleton.h"
+
+static NSString * const kSegueToChangePassword = @"SettingsToChangePassword";
+static NSString * const kSegueToSMXLogin = @"SettingsToSMXLogin";
+static NSString * const kSegueToSMXNewPassword = @"SettingsToSMXNewPassword";
+static NSString * const kSegueToSMXConfirmPassword = @"SettingsToSMXConfirmPassword";
+static NSString * const kSegueToRemoteDesktop = @"SettingsToRemoteDesktop";
+
+#define VIEW_CONTROLLER_ID_SMX_LOGIN @"SMXLoginViewControllerID"
+#define VIEW_CONTROLLER_ID_SMX_NEWPASS @"SMXNewPasswordViewControllerID"
+#define VIEW_CONTROLLER_ID_CHANGE_PASSWORD @"ChangePasswordViewControllerID"
+
+typedef NS_ENUM(NSInteger, SettingsTableSectionIndex) {
+ kSettingsTableSectionIndexInfo = 0,
+ kSettingsTableSectionIndexRemoteDesktop,
+ kSettingsTableSectionIndexDeviceID,
+ kSettingsTableSectionIndexFaceID,
+ kSettingsTableSectionIndexGestureID,
+ kSettingsTableSectionIndexLogout
+};
+
+static NSInteger const kChangePasswordRowIndex = 1;
+
+@interface SettingsViewController ()
+
+@property (weak, nonatomic) IBOutlet UILabel *usernameLabel;
+@property (weak, nonatomic) IBOutlet UILabel *deviceIDLabel;
+@property (weak, nonatomic) IBOutlet UITableViewCell *deviceIDCell;
+@property (weak, nonatomic) IBOutlet UITableViewCell *passwordCell;
+
+@property (weak, nonatomic) IBOutlet UILabel *faceIDLable;
+@property (weak, nonatomic) IBOutlet UISwitch *faceIDSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *gestureSwitch;
+
+@end
+
+@implementation SettingsViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleVPNNotification:) name:kVPNMessageNotification object:nil];
+
+ [self setVerifySwitch];
+ [self setUsernameLabel];
+ [self setDeviceID];
+ [self enableOrDisableChangePassword];
+
+ [self.faceIDSwitch addTarget:self action:@selector(mAuthSwitch:) forControlEvents:UIControlEventTouchUpInside];
+ [self.gestureSwitch addTarget:self action:@selector(mAuthSwitch:) forControlEvents:UIControlEventTouchUpInside];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+
+-(void) setVerifySwitch
+{
+ NSString *strAuthType = [self judgeAuthType] == LCBiometricsTypeTouchID ? @"TouchID" : @"FaceID";
+ self.faceIDLable.text = NSLocalizedString(strAuthType, nil);
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ self.gestureSwitch.on = gw.isGestureEnabled;
+ self.faceIDSwitch.on = gw.isFaceOrTouchIDEnabled;
+
+ if (![SecuritySetting hasGesture]){
+
+ self.gestureSwitch.on = NO;
+ gw.isGestureEnabled = NO;
+ }
+
+ BOOL isLocked = [Singleton sharedSingleton].isFaceIDOrTouchIDLocked;
+ if (isLocked){
+
+ self.faceIDSwitch.on = NO;
+ gw.isFaceOrTouchIDEnabled = NO;
+ }
+
+ if (![Singleton sharedSingleton].isSupportAuth){
+
+ gw.isFaceOrTouchIDEnabled = NO;
+ gw.isGestureEnabled = NO;
+ }
+ [[GatewayManager sharedInstance] updateGateway:gw];
+}
+
+- (void)setUsernameLabel {
+ VPNAccount *account = [AAAManager sharedInstance].account;
+ if (account) {
+ self.usernameLabel.text = account.userName;
+ }
+}
+
+- (void)setDeviceID {
+ NSString *deviceID = [AAAManager sharedInstance].deviceID;
+ if (deviceID) {
+ self.deviceIDLabel.text = deviceID;
+ }
+}
+
+- (void)logout {
+ __weak typeof(self) weakSelf = self;
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"WARNING", nil)
+ message:NSLocalizedString(@"Would you like to sign out?", nil)
+ confirmAction:^{
+ [weakSelf stopVPNAndLogout];
+ }
+ cancelAction:nil];
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+- (void)stopVPNAndLogout {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{ // Stop timer rules fisrt.
+ [[RulesManager sharedInstance] stopAllRules];
+ });
+
+ AAAManager *manager = [AAAManager sharedInstance];
+ [manager continueVPNThreadWithAccount:nil];
+ [self stopVPN];
+
+ __weak typeof(self) weakSelf = self;
+ [self.view makeToastActivity:CSToastPositionCenter];
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [[AAAManager sharedInstance] stopL3VPNDirectly];
+ if (ret != ERR_SUCCESS) {
+ ANError(@"Logout failed with error code: %zi.", ret);
+ }
+
+ __strong typeof(weakSelf) strongSelf = weakSelf;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [strongSelf.view hideToastActivity];
+ [strongSelf dismissViewControllerAnimated:YES completion:nil];
+ });
+ });
+}
+
+// Copy menu for deviceID
+- (void)showCopyMenu {
+ [self.deviceIDLabel becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *copyItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Copy", nil) action:@selector(customCopy:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:copyItem, nil]];
+ [controller setTargetRect:self.deviceIDCell.contentView.frame inView:self.deviceIDCell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)customCopy:(id)sender {
+ UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
+ pasteboard.string = self.deviceIDLabel.text;
+ ANDebug(@"Pasted string: %@", pasteboard.string);
+}
+
+// Remote Desktop Setting
+- (void)showRemoteDesktopSettings {
+ [self performSegueWithIdentifier:kSegueToRemoteDesktop sender:nil];
+}
+
+// Change password related
+- (void)enableOrDisableChangePassword {
+ BOOL isChangePasswordEnabled = [self isChangePasswordEnabled];
+ self.passwordCell.userInteractionEnabled = isChangePasswordEnabled;
+ self.passwordCell.contentView.alpha = isChangePasswordEnabled ? 1.0 : 0.5;
+}
+
+- (BOOL)isChangePasswordEnabled {
+ return ([self isLocalDBChangePasswordEnabled] ||
+ [self isLDAPChangePasswordEnabled] ||
+ [[AAAManager sharedInstance] isCurrentMethodSMXAuth]);
+}
+
+- (BOOL)isLocalDBChangePasswordEnabled {
+ return ([ConfigurationManager sharedInstance].changePassword.isLocalDBEnabled &&
+ [[AAAManager sharedInstance] isAuthTypeInLoginMethod:AUTH_LOCALDB]);
+}
+
+- (BOOL)isLDAPChangePasswordEnabled {
+ return ([ConfigurationManager sharedInstance].changePassword.isLDAPEnabled &&
+ [[AAAManager sharedInstance] isAuthTypeInLoginMethod:AUTH_LDAP]);
+}
+
+#define CHANGE_PASSWORD_MULTI_METHODS -2
+#define CHANGE_PASSWORD_NOT_SUPPORT -1
+#define CHANGE_PASSWORD_SUCCESS 0
+#define CHANGE_PASSWORD_SMX_SESSION_EXPIRED 3
+
+- (NSInteger)initiateChangePassword {
+ auth_type_t authType = AUTH_LOCALDB;
+ char *server = NULL;
+ AAAManager *manager = [AAAManager sharedInstance];
+ aaa_auth_info_t *autoInfo = manager.autoInfoBack;
+
+ if (autoInfo != NULL && autoInfo->method_num == 1) {
+ auth_method_t auth_method = autoInfo->methods[0];
+
+ InformationToSave *infor = [InformationToSave sharedInstance];
+ NSString *loginMethod = infor.lastLoginAccount.loginMethod;
+ NSString *authMethodName = [[NSString alloc] initWithCString:auth_method.name encoding:NSUTF8StringEncoding];
+ if ([authMethodName isEqualToString:loginMethod] || [loginMethod isEqualToString:@"DD_Register"]) {
+ authType = auth_method.type;
+ server = auth_method.server;
+ if (auth_method.multi_step_num > 0) {
+ ANInfo(@"Multi-step authentication site, user has to switch server to change password.");
+ return CHANGE_PASSWORD_MULTI_METHODS;
+ }
+ } else if (auth_method.multi_step_num > 0) {
+ auth_multi_method_t multi_method = auth_method.multi_steps[auth_method.multi_step_num-1];
+ authType = multi_method.type;
+ server = multi_method.server;
+ } else {
+ authType = auth_method.type;
+ server = auth_method.server;
+ }
+ } else if (autoInfo != NULL && autoInfo->method_num > 1) {
+ InformationToSave *infor = [InformationToSave sharedInstance];
+ NSString *loginMethod = infor.lastLoginAccount.loginMethod;
+ for (int i =0; i < autoInfo->method_num; i++) {
+ auth_method_t auth_method = autoInfo->methods[i];
+ NSString *authMethodName = [[NSString alloc] initWithCString:auth_method.name encoding:NSUTF8StringEncoding];
+ if ([authMethodName isEqualToString:loginMethod]) {
+ if (auth_method.multi_step_num > 0) {
+ ANInfo(@"Multi-step authentication site, user has to switch server to change password.");
+ return CHANGE_PASSWORD_MULTI_METHODS;
+ }
+ authType = auth_method.type;
+ server = auth_method.server;
+ break;
+ }
+ }
+ } else {
+ return CHANGE_PASSWORD_NOT_SUPPORT;
+ }
+
+ if (authType != AUTH_LOCALDB &&
+ authType != AUTH_LDAP &&
+ authType != AUTH_SMX) {
+ return CHANGE_PASSWORD_NOT_SUPPORT;
+ }
+
+ return array_vpn_change_password(authType, server);
+}
+
+- (void)showAAAMethodsPickerWithMethodNames:(NSArray *)methodNames {
+ if (methodNames == nil || [methodNames count] == 0) {
+ ANError(@"Multi-step method names array is empty, can not show picker.");
+ return;
+ }
+
+ [ActionSheetStringPicker showPickerWithTitle:NSLocalizedString(@"Authentication List", nil)
+ rows:methodNames
+ initialSelection:0
+ doneBlock:^(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue) {
+ NSString *selectedServerName = (NSString *)selectedValue;
+ ANInfo(@"Server name of %@ is selected, change password will be continue.", selectedServerName);
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [[AAAManager sharedInstance] changePasswordWithAAAServerName:selectedServerName];
+ if (ret == 0) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self promptMessage:NSLocalizedString(@"Password has been updated", nil)];
+ });
+ }
+ });
+ }
+ cancelBlock:nil
+ origin:self.passwordCell.contentView]; // Use "contentView" to compitable with iPad.
+}
+
+- (void)promptMessage:(NSString *)message {
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:@"" message:message];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+}
+
+- (void)handleVPNNotification:(NSNotification *)notification {
+ VPNMessage *msg = notification.object;
+ BOOL showAlert = YES;
+ switch (msg.code) {
+ case VPN_CB_CHANGPASSWORD: {
+ if ([self.navigationController.topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_CHANGE_PASSWORD]) {
+ [self refreshTopView];
+ } else {
+ [self performSegueWithIdentifier:kSegueToChangePassword sender:self];
+ }
+ break;
+ }
+ case VPN_CB_SMX:{
+ NSString *errorMsg = nil;
+ AAAManager *manager = [AAAManager sharedInstance];
+ vpn_smx_info_t *smx_info = manager.smx_info;
+ if (smx_info != NULL) {
+ ANInfo(@"smx_info->action: %d", smx_info->action);
+ switch (smx_info->action) {
+ case SMX_ACTION_INPUT_PASS:
+ case SMX_ACTION_INPUT_OLD_PASS: {
+ UIViewController *topViewController = self.navigationController.topViewController;
+ if ([topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_LOGIN]) {
+ //If the top controller is login controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ showAlert = NO;
+ [self performSegueWithIdentifier:kSegueToSMXLogin sender:nil];
+ }
+ break;
+ }
+ case SMX_ACTION_INPUT_NEW_PASS: {
+ UIViewController *topViewController = self.navigationController.topViewController;
+ if ([topViewController.restorationIdentifier isEqualToString:VIEW_CONTROLLER_ID_SMX_NEWPASS]) {
+ //If the top controller is new password controller, do nothing but send the status to it.
+ [self refreshTopView];
+ showAlert = YES;
+ } else {
+ showAlert = NO;
+ [self performSegueWithIdentifier:kSegueToSMXNewPassword sender:nil];
+ }
+ break;
+ }
+ case SMX_ACTION_PASS_CONFIRM:
+ showAlert = NO;
+ [self performSegueWithIdentifier:kSegueToSMXConfirmPassword sender:nil];
+ break;
+
+ default:
+ break;
+ }
+
+ if (showAlert) {
+ errorMsg = [NSString stringWithUTF8String:smx_info->errmsg];
+ if (![errorMsg isEqual:@"OK"] && ![errorMsg isEqual:@"正常"]) {
+ [self promptMessage:errorMsg];
+ }
+ }
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+}
+
+- (void)refreshTopView {
+ UIViewController *topViewController = self.navigationController.topViewController;
+ SEL handler = NSSelectorFromString(@"refreshView");
+ if ([topViewController respondsToSelector:handler]) {
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [topViewController performSelector:handler];
+ }
+}
+
+#pragma mark - UITableViewDelegate
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger section = indexPath.section;
+ NSInteger row = indexPath.row;
+ if (section == kSettingsTableSectionIndexInfo && row == kChangePasswordRowIndex) {
+ dispatch_async(dispatch_get_global_queue(0, 0), ^{
+ NSInteger ret = [self initiateChangePassword];
+ if (ret == CHANGE_PASSWORD_SUCCESS) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self promptMessage:NSLocalizedString(@"Password has been updated", nil)];
+ });
+ } else if (ret == CHANGE_PASSWORD_NOT_SUPPORT) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self promptMessage:NSLocalizedString(@"The authentication method is not supported to change password!", nil)];
+ });
+ } else if (ret == CHANGE_PASSWORD_MULTI_METHODS) {
+ // Multi-step authentication.
+ BOOL localdbChangePasswordEnabled = [self isLocalDBChangePasswordEnabled];
+ BOOL ldapChangePasswordEnabled = [self isLDAPChangePasswordEnabled];
+ NSArray *methodNames = [[AAAManager sharedInstance] multiStepMethodNamesWithLocalDB:localdbChangePasswordEnabled
+ ladp:ldapChangePasswordEnabled];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self showAAAMethodsPickerWithMethodNames:methodNames];
+ });
+ } else if (ret == CHANGE_PASSWORD_SMX_SESSION_EXPIRED) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self promptMessage:NSLocalizedString(@"SMX session expired!", nil)];
+ });
+ }
+ });
+ } else if (section == kSettingsTableSectionIndexDeviceID) {
+ [self showCopyMenu];
+ } else if (section == kSettingsTableSectionIndexRemoteDesktop) {
+ [self showRemoteDesktopSettings];
+ } else if (indexPath.section == kSettingsTableSectionIndexLogout) {
+ [self logout];
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ CGFloat height = 0;
+
+ switch (section) {
+ case kSettingsTableSectionIndexInfo:
+ case kSettingsTableSectionIndexDeviceID:
+ case kSettingsTableSectionIndexRemoteDesktop:
+ case kSettingsTableSectionIndexFaceID:
+ case kSettingsTableSectionIndexGestureID:
+ height = 15;
+ break;
+ case kSettingsTableSectionIndexLogout:
+ height = 35;
+ break;
+
+ default:
+ break;
+ }
+
+ return height;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+
+ if (section == 0){
+
+ return 2;
+ }else if ((section == 3 || section == 4) && ![Singleton sharedSingleton].isSupportAuth){
+
+ return 0;
+ }
+
+ return 1;
+}
+
+-(void) mAuthSwitch: (UISwitch *) sender
+{
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+
+ if (sender == self.faceIDSwitch){
+
+ gw.isFaceOrTouchIDEnabled = sender.on;
+ if ([self judgeAuthType] == LCBiometricsTypeTouchID){
+
+ [self modifyTouchIDAuthSetting:sender];
+ }else{
+
+ [self modifyFaceIDAuthSetting:sender];
+ }
+
+ }else if (sender == self.gestureSwitch){
+
+ if (sender.on == YES){
+
+ [self.gestureSwitch setOn:NO animated:YES];
+
+ SetupGestureViewController *control = [[SetupGestureViewController alloc] init];
+ control.resultBlock = ^{
+
+ [self.gestureSwitch setOn:YES animated:YES];
+ gw.isGestureEnabled = YES;
+ [[GatewayManager sharedInstance] updateGateway:gw];
+ };
+ control.modalPresentationStyle = UIModalPresentationFullScreen;
+ [self presentViewController:control animated:YES completion:nil];
+ }else{
+
+ [SecuritySetting clearGesture];
+ }
+ gw.isGestureEnabled = self.gestureSwitch.on;
+ }
+ [[GatewayManager sharedInstance] updateGateway:gw];
+}
+
+-(LCBiometricsType) judgeAuthType
+{
+ return [SecuritySetting isSupportBiometricsAuth];
+}
+
+- (void)modifyFaceIDAuthSetting:(UISwitch *) sender{
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (sender.on) {
+ __weak typeof(self) weakSelf = self;
+ [BioAuth startBiometricsAuthType:LCBiometricsTypeFaceID
+ WithAction:BioAuthOpen
+ completion:^(BOOL isSuccess, NSString *errorMsg){
+ if(isSuccess){
+ } else{
+
+ if (ISNULLSTR(errorMsg) || [errorMsg isEqualToString:@""]){
+ errorMsg = NSLocalizedString(@"Open failed", nil);
+ }
+
+ gw.isFaceOrTouchIDEnabled = NO;
+ [self.faceIDSwitch setOn:NO animated:YES]; //开启失败，switch状态设置为NO
+ [[GatewayManager sharedInstance] updateGateway:gw];
+
+ NSString *message = NSLocalizedString(errorMsg, nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ }];
+ }else{
+ }
+}
+
+- (void)modifyTouchIDAuthSetting:(UISwitch *) sender{
+
+ Gateway *gw = [[[GatewayModel alloc] init] currentGatewayUpInside];
+ if (sender.on) {
+ __weak typeof(self) weakSelf = self;
+ [BioAuth startBiometricsAuthType:LCBiometricsTypeTouchID
+ WithAction:BioAuthOpen
+ completion:^(BOOL isSuccess, NSString *errorMsg){
+ if(isSuccess){
+ }
+ else{
+
+ if (ISNULLSTR(errorMsg) || [errorMsg isEqualToString:@""]){
+ errorMsg = NSLocalizedString(@"Open failed", nil);
+ }
+
+ gw.isFaceOrTouchIDEnabled = NO;
+ [self.faceIDSwitch setOn:NO animated:YES]; //开启失败，switch状态设置为NO
+ [[GatewayManager sharedInstance] updateGateway:gw];
+
+ NSString *message = NSLocalizedString(errorMsg, nil);
+ PopupDialog *dialog = [ANPopupDialog singleButtonPopupDialogWithTitle:NSLocalizedString(@"Error", nil)
+ message:message];
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+ }
+ }];
+ } else{
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.h (working copy)
@@ -0,0 +1,13 @@
+//
+// StatusViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface StatusViewController : UITableViewController
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m (working copy)
@@ -0,0 +1,504 @@
+//
+// StatusViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+#include
+#import "ANLogger.h"
+#import "arrayapi.h"
+#import "vpnplugin.h"
+#import "ArrayVPNManager.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "StatusViewController.h"
+#import "DNSSettingCell.h"
+#import "UIViewController+HideKeyboard.h"
+
+BOOL isValidDNSServer(const char *dnsServer);
+
+BOOL isValidDNSServer(const char *dnsServer)
+{
+ if (!dnsServer) {
+ return NO;
+ }
+
+ struct sockaddr_in sa;
+ int result = inet_pton(AF_INET, dnsServer, &(sa.sin_addr));
+ return result != 0;
+}
+
+#define SECTIONS_IN_STATUS_VIEW 2
+#define ROWS_IN_SECTION_CONNECTION_INFO 6
+#define ROWS_IN_SECIONT_STATISTICS 2
+
+typedef NS_ENUM(NSInteger, StatusSectionIndex) {
+ kStatusSectionConnectionInfo = 0,
+ kStatusSectionDNS,
+ kStatusSectionStatistics,
+ kStatusSectionTotal
+};
+
+#define TIMER_PERIOD 1
+#define REFRESH_VPN_STATUS_PERIOD 3
+
+NSString * const kAppGroupNameStatus = @"group.net.arraynetworks.MotionProPlus";
+
+
+@interface StatusViewController () {
+ NSTimer *_timer;
+ NSInteger _tick;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *stateLabel;
+@property (weak, nonatomic) IBOutlet UILabel *serverLabel;
+@property (weak, nonatomic) IBOutlet UILabel *ipAddressLabel;
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *mtuLabel;
+@property (weak, nonatomic) IBOutlet UILabel *modeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataSentLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataReceivedLabel;
+@property (strong, nonatomic) NSMutableArray *dnsList;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation StatusViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+
+ [self.tableView registerNib:[UINib nibWithNibName:@"DNSSettingCell" bundle:nil] forCellReuseIdentifier:kDNSSettingCellID];
+ self.needReconnect = NO;
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"viewDidLoad:get new dns list[%@]", newDNSList);
+ if (newDNSList.count > 0) {
+ [userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"viewDidLoad:get dns list= %@", _dnsList);
+ }
+
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [self setVPNStatus];
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self setMTU];
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [self stopFetchInfo];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - All Status Information
+- (void)setVPNStatus {
+ NSString *statusString = @"";
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ switch (tunnelStatus) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnecting:
+ case ArrayVPNDisconnected:
+ statusString = NSLocalizedString(@"Disconnected", nil);
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ statusString = NSLocalizedString(@"Connecting...", nil);
+ break;
+ case ArrayVPNConnected:
+ statusString = NSLocalizedString(@"Connected", nil);
+ break;
+ default:
+ ANError(@"Invalid VPN tunnel status \(%zi).", tunnelStatus);
+ break;
+ }
+
+ self.stateLabel.text = statusString;
+}
+
+// VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANInfo(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+ [self stopFetchInfo];
+ if (self.needReconnect && tunnelStatus == ArrayVPNDisconnected) {
+ ANInfo(@"custom dns server config, now need restart vpn.");
+ self.needReconnect = NO;
+ [self startVPN:NO];
+ }
+ } else {
+ if (_timer == nil) {
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+ ANInfo(@"Array VPN tunnel status is connected");
+ if (tunnelStatus == ArrayVPNConnected) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ for (int i = 0; i < 3; i++) {
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"get new dns list[%@], i =%d", newDNSList, i);
+ if (newDNSList.count > 0) {
+ //[userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"status connected:get dns list= %@", _dnsList);
+ [self.tableView reloadData];
+ break;
+ } else {
+ sleep(1);
+ }
+ }
+ }
+ }
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+
+ [vpnWrapper startSSLVPN];
+
+ return YES;
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+// Clear all statistics information if vpn is not connected.
+- (BOOL)clearVPNInfoIfNotConnected {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+
+ return YES;
+ }
+
+ return NO;
+}
+
+- (void)clearVPNInfo {
+ self.serverLabel.text = @"";
+ self.ipAddressLabel.text = @"";
+ self.timeLabel.text = @"";
+ self.mtuLabel.text = @"";
+ self.modeLabel.text = @"";
+ self.dataSentLabel.text = @"";
+ self.dataReceivedLabel.text = @"";
+}
+
+// From local progress.
+- (void)setConnectedTime {
+ NSDate *connectedDate = [ArrayVPNManager sharedInstance].tunnelManager.connection.connectedDate;
+ NSString *timeString = [self formatDate:connectedDate];
+
+ self.timeLabel.text = timeString;
+}
+
+// MTU is hard-coded, default value is 1400.
+- (void)setMTU {
+ self.mtuLabel.text = [NSString stringWithFormat:@"%d", VPN_PLUGIN_DEFAULT_MTU];
+}
+
+// From VPN extension.
+- (void)refreshVPNStatusWithPeriod:(NSTimeInterval)period {
+ _timer = [NSTimer timerWithTimeInterval:period
+ target:self
+ selector:@selector(timerHandler)
+ userInfo:nil
+ repeats:YES];
+
+ [[NSRunLoop currentRunLoop]addTimer:_timer forMode:NSDefaultRunLoopMode];
+ [_timer fire];
+}
+
+- (void)timerHandler {
+ if (++_tick == REFRESH_VPN_STATUS_PERIOD) {
+ _tick = 0;
+
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [self setConnectedTime];
+ [self setMTU];
+}
+
+- (void)fetchVPNTunnelStatsInfo {
+ NSError *error = nil;
+
+ NETunnelProviderManager *manager = [[ArrayVPNManager sharedInstance] tunnelManager];
+ NETunnelProviderSession *session = (NETunnelProviderSession *)manager.connection;
+
+ NSDictionary *IPCRequestDict = @{(__bridge NSString *)kIPCType:(__bridge NSString *)kIPCStatsRequest};
+ NSData *IPCRequest = [NSJSONSerialization dataWithJSONObject:IPCRequestDict
+ options:NSJSONWritingPrettyPrinted
+ error:nil];
+
+ __weak typeof(self) weakSelf = self;
+ [session sendProviderMessage:IPCRequest
+ returnError:&error
+ responseHandler:^(NSData * _Nullable responseData) {
+ if (responseData) {
+ ANDebug(@"IPC response received.");
+
+ NSError *error = nil;
+ NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:responseData
+ options:NSJSONReadingMutableContainers
+ error:&error];
+ if (!dict) {
+ ANError(@"Parse IPC response failed with error: %@.", error);
+ return;
+ }
+ NSDictionary *IPCData = [dict objectForKey:(__bridge NSString *)kIPCResponseData];
+ if (responseData != nil) {
+ [weakSelf updateDisplayedVPNStatsWithDict:IPCData];
+ } else {
+ ANError(@"IPC data is not found in response.");
+ }
+ } else {
+ ANError(@"IPC response is nil.");
+ }
+ }];
+ if (error) {
+ ANError(@"Send IPC failed with error: %@.", error.localizedDescription);
+ }
+}
+
+- (void)updateDisplayedVPNStatsWithDict:(NSDictionary *)dict {
+ NSNumber *clientIP = [dict objectForKey:(__bridge NSString *)kIPCStatsClientIP];
+ NSString *serverHost = [dict objectForKey:(__bridge NSString *)kIPCStatsServerHost];
+ NSNumber *sentBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsSentBytes];
+ NSNumber *receivedBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsReceviedBytes];
+ NSNumber *isFullTunnel = [dict objectForKey:(__bridge NSString *)kIPCStatsIsFullTunnel];
+
+ NSString *sentToShow = [self formatBytes:[sentBytes stringValue]];
+ NSString *recvToShow = [self formatBytes:[receivedBytes stringValue]];
+
+ self.ipAddressLabel.text = [self formatIP:clientIP];
+ self.serverLabel.text = serverHost;
+ self.modeLabel.text = [isFullTunnel boolValue] ? NSLocalizedString(@"Full Tunnel", nil) : NSLocalizedString(@"Split Tunnel", nil);
+
+ if (sentToShow) {
+ self.dataSentLabel.text = sentToShow;
+ }
+ if (recvToShow) {
+ self.dataReceivedLabel.text = recvToShow;
+ }
+}
+
+- (void)stopFetchInfo {
+ [_timer invalidate];
+ _timer = nil;
+}
+
+#pragma mark - Helpers
+- (NSString *)formatIP:(NSNumber *)IP {
+ if (!IP) {
+ return @"0.0.0.0";
+ }
+
+ uint32_t ip = [IP unsignedIntValue];
+
+ return [NSString stringWithFormat:@"%d.%d.%d.%d", IPSTR(ip)];
+}
+
+- (NSString *)formatBytes:(NSString *)bytes {
+
+#define K_BYTES 1024
+#define M_BYTES (1024 * 1024)
+
+ if (!bytes) {
+ return nil;
+ }
+
+ uint64_t uBytes = (uint64_t)[bytes integerValue];
+ if (uBytes > M_BYTES) {
+ return [NSString stringWithFormat:@"%.1f MB", (double)uBytes/M_BYTES];
+ } else if (uBytes > K_BYTES) {
+ return [NSString stringWithFormat:@"%.1f KB", (double)uBytes/K_BYTES];
+ }
+
+ return [NSString stringWithFormat:@"%@ B", bytes];
+}
+
+- (NSString *)formatDate:(NSDate *)date {
+ if (!date) {
+ return NSLocalizedString(@"Unconnected", nil);
+ }
+
+ NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+ NSTimeInterval connectedDateInterval = [date timeIntervalSince1970];
+ NSUInteger seconds = (NSUInteger)round(now - connectedDateInterval);
+ NSString *dateString = [NSString stringWithFormat:@"%02zi:%02zi:%02zi",
+ seconds / 3600, (seconds / 60) % 60, seconds % 60];
+
+ return [NSString stringWithFormat:@"%@", dateString];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return kStatusSectionTotal;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if (section == kStatusSectionConnectionInfo) {
+ return 6;
+ } else if (section == kStatusSectionStatistics) {
+ return 2;
+ } else if (section == kStatusSectionDNS){
+ if (_dnsList.count < 16) {
+ return _dnsList.count + 1;
+ } else {
+ return 16;
+ }
+ }
+ return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+
+ if (indexPath.section == kStatusSectionDNS) {
+ DNSSettingCell *dnsSettingCell = [tableView dequeueReusableCellWithIdentifier:kDNSSettingCellID];
+ dnsSettingCell.delegate = self;
+ if (!dnsSettingCell) {
+ dnsSettingCell = [[DNSSettingCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kDNSSettingCellID];;
+ }
+
+ NSInteger row = indexPath.row;
+ if (_dnsList.count < 16) {
+ if (row == 0) {
+ [dnsSettingCell configureCellWithMessage:@"" isAddCell:YES];
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row - 1] isAddCell:NO];
+ }
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row] isAddCell:NO];
+ }
+
+ return dnsSettingCell;
+ } else {
+ cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+ }
+ return cell;
+}
+
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 35;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - DNSSettingCellDelegate
+- (void)DNSSettingButtonDidClickedWithCell:(UITableViewCell *)cell isAdd:(BOOL)bAdd {
+ DNSSettingCell* dnsCell = (DNSSettingCell *)(cell);
+ NSMutableArray *tmpArray = [NSMutableArray arrayWithArray:_dnsList];
+ NSString *errMessage = @"", *titleMessage = @"";
+ if (bAdd) {
+ NSArray *newDnsArray = [dnsCell.addDnsTextField.text componentsSeparatedByString:@";"];
+ BOOL bValidDNSServer = YES;
+ if ([newDnsArray count] > 0) {
+ for (NSString *signalDNS in newDnsArray) {
+ if (!isValidDNSServer([signalDNS UTF8String])) {
+ bValidDNSServer = NO;
+ }
+ }
+ } else {
+ bValidDNSServer = NO;
+ }
+
+ if (bValidDNSServer) {
+ [tmpArray addObjectsFromArray:newDnsArray];
+ } else {
+ errMessage = NSLocalizedString(@"The format of the DNS server is invalid.", nil);
+ titleMessage = NSLocalizedString(@"Error", nil);
+ }
+ } else {
+ [tmpArray removeObject:dnsCell.descText.text];
+ if([tmpArray count] <= 0) {
+ errMessage = NSLocalizedString(@"Make sure at least one DNS server exists in the system.", nil);
+ titleMessage = NSLocalizedString(@"Information", nil);
+ }
+ }
+
+ if ([errMessage length] > 0) {
+ PopupDialog *popup = [ANPopupDialog singleButtonPopupDialogWithTitle:titleMessage message:errMessage];
+ [self presentViewController:popup animated:YES completion:nil];
+ return;
+ }
+ _dnsList = tmpArray;
+ ANInfo(@"new dns list=%@", _dnsList);
+ [self.tableView reloadData];
+
+ NSString *dnsListString = [_dnsList componentsJoinedByString:@";"];
+ Gateway *currentGateway = [self getCurrentGateway];
+ currentGateway.customDnsList = dnsListString;
+ ANInfo(@"save current gateway custom dns list=%@", currentGateway.customDnsList);
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ [gatewayManager updateGateway:currentGateway];
+ self.needReconnect = YES;
+ [self stopVPN];
+}
+
+- (Gateway *)getCurrentGateway {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ if ([url length] <= 0) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length > 0) {
+ ANInfo(@"getCurrentGateway: Get oauth url[%@].", oauthUrl);
+ NSRange range = [oauthUrl rangeOfString:@"https://"];
+ oauthUrl = [oauthUrl substringFromIndex:range.location + range.length];
+ range = [oauthUrl rangeOfString:@"/prx/000/"];
+ url = [oauthUrl substringToIndex:range.location];
+ ANInfo(@"getCurrentGateway: Get url[%@].", url);
+ }
+ }
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.InfosecEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.InfosecEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.InfosecEnterprise (working copy)
@@ -0,0 +1,509 @@
+//
+// StatusViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+#include
+#import "ANLogger.h"
+#import "arrayapi.h"
+#import "vpnplugin.h"
+#import "ArrayVPNManager.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "StatusViewController.h"
+#import "DNSSettingCell.h"
+#import "UIViewController+HideKeyboard.h"
+
+BOOL isValidDNSServer(const char *dnsServer);
+
+BOOL isValidDNSServer(const char *dnsServer)
+{
+ if (!dnsServer) {
+ return NO;
+ }
+
+ struct sockaddr_in sa;
+ int result = inet_pton(AF_INET, dnsServer, &(sa.sin_addr));
+ return result != 0;
+}
+
+#define SECTIONS_IN_STATUS_VIEW 2
+#define ROWS_IN_SECTION_CONNECTION_INFO 6
+#define ROWS_IN_SECIONT_STATISTICS 2
+
+typedef NS_ENUM(NSInteger, StatusSectionIndex) {
+ kStatusSectionConnectionInfo = 0,
+ kStatusSectionDNS,
+ kStatusSectionStatistics,
+ kStatusSectionTotal
+};
+
+#define TIMER_PERIOD 1
+#define REFRESH_VPN_STATUS_PERIOD 3
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameStatus = @"group.net.infosec.groupenterprise";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameStatus = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+@interface StatusViewController () {
+ NSTimer *_timer;
+ NSInteger _tick;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *stateLabel;
+@property (weak, nonatomic) IBOutlet UILabel *serverLabel;
+@property (weak, nonatomic) IBOutlet UILabel *ipAddressLabel;
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *mtuLabel;
+@property (weak, nonatomic) IBOutlet UILabel *modeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataSentLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataReceivedLabel;
+@property (strong, nonatomic) NSMutableArray *dnsList;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation StatusViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+
+ [self.tableView registerNib:[UINib nibWithNibName:@"DNSSettingCell" bundle:nil] forCellReuseIdentifier:kDNSSettingCellID];
+ self.needReconnect = NO;
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"viewDidLoad:get new dns list[%@]", newDNSList);
+ if (newDNSList.count > 0) {
+ [userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"viewDidLoad:get dns list= %@", _dnsList);
+ }
+
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [self setVPNStatus];
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self setMTU];
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [self stopFetchInfo];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - All Status Information
+- (void)setVPNStatus {
+ NSString *statusString = @"";
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ switch (tunnelStatus) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnecting:
+ case ArrayVPNDisconnected:
+ statusString = NSLocalizedString(@"Disconnected", nil);
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ statusString = NSLocalizedString(@"Connecting...", nil);
+ break;
+ case ArrayVPNConnected:
+ statusString = NSLocalizedString(@"Connected", nil);
+ break;
+ default:
+ ANError(@"Invalid VPN tunnel status \(%zi).", tunnelStatus);
+ break;
+ }
+
+ self.stateLabel.text = statusString;
+}
+
+// VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANInfo(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+ [self stopFetchInfo];
+ if (self.needReconnect && tunnelStatus == ArrayVPNDisconnected) {
+ ANInfo(@"custom dns server config, now need restart vpn.");
+ self.needReconnect = NO;
+ [self startVPN:NO];
+ }
+ } else {
+ if (_timer == nil) {
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+ ANInfo(@"Array VPN tunnel status is connected");
+ if (tunnelStatus == ArrayVPNConnected) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ for (int i = 0; i < 3; i++) {
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"get new dns list[%@], i =%d", newDNSList, i);
+ if (newDNSList.count > 0) {
+ //[userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"status connected:get dns list= %@", _dnsList);
+ [self.tableView reloadData];
+ break;
+ } else {
+ sleep(1);
+ }
+ }
+ }
+ }
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+ return YES;
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+// Clear all statistics information if vpn is not connected.
+- (BOOL)clearVPNInfoIfNotConnected {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+
+ return YES;
+ }
+
+ return NO;
+}
+
+- (void)clearVPNInfo {
+ self.serverLabel.text = @"";
+ self.ipAddressLabel.text = @"";
+ self.timeLabel.text = @"";
+ self.mtuLabel.text = @"";
+ self.modeLabel.text = @"";
+ self.dataSentLabel.text = @"";
+ self.dataReceivedLabel.text = @"";
+}
+
+// From local progress.
+- (void)setConnectedTime {
+ NSDate *connectedDate = [ArrayVPNManager sharedInstance].tunnelManager.connection.connectedDate;
+ NSString *timeString = [self formatDate:connectedDate];
+
+ self.timeLabel.text = timeString;
+}
+
+// MTU is hard-coded, default value is 1400.
+- (void)setMTU {
+ self.mtuLabel.text = [NSString stringWithFormat:@"%d", VPN_PLUGIN_DEFAULT_MTU];
+}
+
+// From VPN extension.
+- (void)refreshVPNStatusWithPeriod:(NSTimeInterval)period {
+ _timer = [NSTimer timerWithTimeInterval:period
+ target:self
+ selector:@selector(timerHandler)
+ userInfo:nil
+ repeats:YES];
+
+ [[NSRunLoop currentRunLoop]addTimer:_timer forMode:NSDefaultRunLoopMode];
+ [_timer fire];
+}
+
+- (void)timerHandler {
+ if (++_tick == REFRESH_VPN_STATUS_PERIOD) {
+ _tick = 0;
+
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [self setConnectedTime];
+ [self setMTU];
+}
+
+- (void)fetchVPNTunnelStatsInfo {
+ NSError *error = nil;
+
+ NETunnelProviderManager *manager = [[ArrayVPNManager sharedInstance] tunnelManager];
+ NETunnelProviderSession *session = (NETunnelProviderSession *)manager.connection;
+
+ NSDictionary *IPCRequestDict = @{(__bridge NSString *)kIPCType:(__bridge NSString *)kIPCStatsRequest};
+ NSData *IPCRequest = [NSJSONSerialization dataWithJSONObject:IPCRequestDict
+ options:NSJSONWritingPrettyPrinted
+ error:nil];
+
+ __weak typeof(self) weakSelf = self;
+ [session sendProviderMessage:IPCRequest
+ returnError:&error
+ responseHandler:^(NSData * _Nullable responseData) {
+ if (responseData) {
+ ANDebug(@"IPC response received.");
+
+ NSError *error = nil;
+ NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:responseData
+ options:NSJSONReadingMutableContainers
+ error:&error];
+ if (!dict) {
+ ANError(@"Parse IPC response failed with error: %@.", error);
+ return;
+ }
+ NSDictionary *IPCData = [dict objectForKey:(__bridge NSString *)kIPCResponseData];
+ if (responseData != nil) {
+ [weakSelf updateDisplayedVPNStatsWithDict:IPCData];
+ } else {
+ ANError(@"IPC data is not found in response.");
+ }
+ } else {
+ ANError(@"IPC response is nil.");
+ }
+ }];
+ if (error) {
+ ANError(@"Send IPC failed with error: %@.", error.localizedDescription);
+ }
+}
+
+- (void)updateDisplayedVPNStatsWithDict:(NSDictionary *)dict {
+ NSNumber *clientIP = [dict objectForKey:(__bridge NSString *)kIPCStatsClientIP];
+ NSString *serverHost = [dict objectForKey:(__bridge NSString *)kIPCStatsServerHost];
+ NSNumber *sentBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsSentBytes];
+ NSNumber *receivedBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsReceviedBytes];
+ NSNumber *isFullTunnel = [dict objectForKey:(__bridge NSString *)kIPCStatsIsFullTunnel];
+
+ NSString *sentToShow = [self formatBytes:[sentBytes stringValue]];
+ NSString *recvToShow = [self formatBytes:[receivedBytes stringValue]];
+
+ self.ipAddressLabel.text = [self formatIP:clientIP];
+ self.serverLabel.text = serverHost;
+ self.modeLabel.text = [isFullTunnel boolValue] ? NSLocalizedString(@"Full Tunnel", nil) : NSLocalizedString(@"Split Tunnel", nil);
+
+ if (sentToShow) {
+ self.dataSentLabel.text = sentToShow;
+ }
+ if (recvToShow) {
+ self.dataReceivedLabel.text = recvToShow;
+ }
+}
+
+- (void)stopFetchInfo {
+ [_timer invalidate];
+ _timer = nil;
+}
+
+#pragma mark - Helpers
+- (NSString *)formatIP:(NSNumber *)IP {
+ if (!IP) {
+ return @"0.0.0.0";
+ }
+
+ uint32_t ip = [IP unsignedIntValue];
+
+ return [NSString stringWithFormat:@"%d.%d.%d.%d", IPSTR(ip)];
+}
+
+- (NSString *)formatBytes:(NSString *)bytes {
+
+#define K_BYTES 1024
+#define M_BYTES (1024 * 1024)
+
+ if (!bytes) {
+ return nil;
+ }
+
+ uint64_t uBytes = (uint64_t)[bytes integerValue];
+ if (uBytes > M_BYTES) {
+ return [NSString stringWithFormat:@"%.1f MB", (double)uBytes/M_BYTES];
+ } else if (uBytes > K_BYTES) {
+ return [NSString stringWithFormat:@"%.1f KB", (double)uBytes/K_BYTES];
+ }
+
+ return [NSString stringWithFormat:@"%@ B", bytes];
+}
+
+- (NSString *)formatDate:(NSDate *)date {
+ if (!date) {
+ return NSLocalizedString(@"Unconnected", nil);
+ }
+
+ NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+ NSTimeInterval connectedDateInterval = [date timeIntervalSince1970];
+ NSUInteger seconds = (NSUInteger)round(now - connectedDateInterval);
+ NSString *dateString = [NSString stringWithFormat:@"%02zi:%02zi:%02zi",
+ seconds / 3600, (seconds / 60) % 60, seconds % 60];
+
+ return [NSString stringWithFormat:@"%@", dateString];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return kStatusSectionTotal;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if (section == kStatusSectionConnectionInfo) {
+ return 6;
+ } else if (section == kStatusSectionStatistics) {
+ return 2;
+ } else if (section == kStatusSectionDNS){
+ if (_dnsList.count < 16) {
+ return _dnsList.count + 1;
+ } else {
+ return 16;
+ }
+ }
+ return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+
+ if (indexPath.section == kStatusSectionDNS) {
+ DNSSettingCell *dnsSettingCell = [tableView dequeueReusableCellWithIdentifier:kDNSSettingCellID];
+ dnsSettingCell.delegate = self;
+ if (!dnsSettingCell) {
+ dnsSettingCell = [[DNSSettingCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kDNSSettingCellID];;
+ }
+
+ NSInteger row = indexPath.row;
+ if (_dnsList.count < 16) {
+ if (row == 0) {
+ [dnsSettingCell configureCellWithMessage:@"" isAddCell:YES];
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row - 1] isAddCell:NO];
+ }
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row] isAddCell:NO];
+ }
+
+ return dnsSettingCell;
+ } else {
+ cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+ }
+ return cell;
+}
+
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 35;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - DNSSettingCellDelegate
+- (void)DNSSettingButtonDidClickedWithCell:(UITableViewCell *)cell isAdd:(BOOL)bAdd {
+ DNSSettingCell* dnsCell = (DNSSettingCell *)(cell);
+ NSMutableArray *tmpArray = [NSMutableArray arrayWithArray:_dnsList];
+ NSString *errMessage = @"", *titleMessage = @"";
+ if (bAdd) {
+ NSArray *newDnsArray = [dnsCell.addDnsTextField.text componentsSeparatedByString:@";"];
+ BOOL bValidDNSServer = YES;
+ if ([newDnsArray count] > 0) {
+ for (NSString *signalDNS in newDnsArray) {
+ if (!isValidDNSServer([signalDNS UTF8String])) {
+ bValidDNSServer = NO;
+ }
+ }
+ } else {
+ bValidDNSServer = NO;
+ }
+
+ if (bValidDNSServer) {
+ [tmpArray addObjectsFromArray:newDnsArray];
+ } else {
+ errMessage = NSLocalizedString(@"The format of the DNS server is invalid.", nil);
+ titleMessage = NSLocalizedString(@"Error", nil);
+ }
+ } else {
+ [tmpArray removeObject:dnsCell.descText.text];
+ if([tmpArray count] <= 0) {
+ errMessage = NSLocalizedString(@"Make sure at least one DNS server exists in the system.", nil);
+ titleMessage = NSLocalizedString(@"Information", nil);
+ }
+ }
+
+ if ([errMessage length] > 0) {
+ PopupDialog *popup = [ANPopupDialog singleButtonPopupDialogWithTitle:titleMessage message:errMessage];
+ [self presentViewController:popup animated:YES completion:nil];
+ return;
+ }
+ _dnsList = tmpArray;
+ ANInfo(@"new dns list=%@", _dnsList);
+ [self.tableView reloadData];
+
+ NSString *dnsListString = [_dnsList componentsJoinedByString:@";"];
+ Gateway *currentGateway = [self getCurrentGateway];
+ currentGateway.customDnsList = dnsListString;
+ ANInfo(@"save current gateway custom dns list=%@", currentGateway.customDnsList);
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ [gatewayManager updateGateway:currentGateway];
+ self.needReconnect = YES;
+ [self stopVPN];
+}
+
+- (Gateway *)getCurrentGateway {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ if ([url length] <= 0) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length > 0) {
+ ANInfo(@"getCurrentGateway: Get oauth url[%@].", oauthUrl);
+ NSRange range = [oauthUrl rangeOfString:@"https://"];
+ oauthUrl = [oauthUrl substringFromIndex:range.location + range.length];
+ range = [oauthUrl rangeOfString:@"/prx/000/"];
+ url = [oauthUrl substringToIndex:range.location];
+ ANInfo(@"getCurrentGateway: Get url[%@].", url);
+ }
+ }
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.InfosecStore
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.InfosecStore (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.InfosecStore (working copy)
@@ -0,0 +1,509 @@
+//
+// StatusViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+#include
+#import "ANLogger.h"
+#import "arrayapi.h"
+#import "vpnplugin.h"
+#import "ArrayVPNManager.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "StatusViewController.h"
+#import "DNSSettingCell.h"
+#import "UIViewController+HideKeyboard.h"
+
+BOOL isValidDNSServer(const char *dnsServer);
+
+BOOL isValidDNSServer(const char *dnsServer)
+{
+ if (!dnsServer) {
+ return NO;
+ }
+
+ struct sockaddr_in sa;
+ int result = inet_pton(AF_INET, dnsServer, &(sa.sin_addr));
+ return result != 0;
+}
+
+#define SECTIONS_IN_STATUS_VIEW 2
+#define ROWS_IN_SECTION_CONNECTION_INFO 6
+#define ROWS_IN_SECIONT_STATISTICS 2
+
+typedef NS_ENUM(NSInteger, StatusSectionIndex) {
+ kStatusSectionConnectionInfo = 0,
+ kStatusSectionDNS,
+ kStatusSectionStatistics,
+ kStatusSectionTotal
+};
+
+#define TIMER_PERIOD 1
+#define REFRESH_VPN_STATUS_PERIOD 3
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameStatus = @"group.net.infosec.MotionPro";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameStatus = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+@interface StatusViewController () {
+ NSTimer *_timer;
+ NSInteger _tick;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *stateLabel;
+@property (weak, nonatomic) IBOutlet UILabel *serverLabel;
+@property (weak, nonatomic) IBOutlet UILabel *ipAddressLabel;
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *mtuLabel;
+@property (weak, nonatomic) IBOutlet UILabel *modeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataSentLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataReceivedLabel;
+@property (strong, nonatomic) NSMutableArray *dnsList;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation StatusViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+
+ [self.tableView registerNib:[UINib nibWithNibName:@"DNSSettingCell" bundle:nil] forCellReuseIdentifier:kDNSSettingCellID];
+ self.needReconnect = NO;
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"viewDidLoad:get new dns list[%@]", newDNSList);
+ if (newDNSList.count > 0) {
+ [userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"viewDidLoad:get dns list= %@", _dnsList);
+ }
+
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [self setVPNStatus];
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self setMTU];
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [self stopFetchInfo];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - All Status Information
+- (void)setVPNStatus {
+ NSString *statusString = @"";
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ switch (tunnelStatus) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnecting:
+ case ArrayVPNDisconnected:
+ statusString = NSLocalizedString(@"Disconnected", nil);
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ statusString = NSLocalizedString(@"Connecting...", nil);
+ break;
+ case ArrayVPNConnected:
+ statusString = NSLocalizedString(@"Connected", nil);
+ break;
+ default:
+ ANError(@"Invalid VPN tunnel status \(%zi).", tunnelStatus);
+ break;
+ }
+
+ self.stateLabel.text = statusString;
+}
+
+// VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANInfo(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+ [self stopFetchInfo];
+ if (self.needReconnect && tunnelStatus == ArrayVPNDisconnected) {
+ ANInfo(@"custom dns server config, now need restart vpn.");
+ self.needReconnect = NO;
+ [self startVPN:NO];
+ }
+ } else {
+ if (_timer == nil) {
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+ ANInfo(@"Array VPN tunnel status is connected");
+ if (tunnelStatus == ArrayVPNConnected) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ for (int i = 0; i < 3; i++) {
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"get new dns list[%@], i =%d", newDNSList, i);
+ if (newDNSList.count > 0) {
+ //[userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"status connected:get dns list= %@", _dnsList);
+ [self.tableView reloadData];
+ break;
+ } else {
+ sleep(1);
+ }
+ }
+ }
+ }
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+ return YES;
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+// Clear all statistics information if vpn is not connected.
+- (BOOL)clearVPNInfoIfNotConnected {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+
+ return YES;
+ }
+
+ return NO;
+}
+
+- (void)clearVPNInfo {
+ self.serverLabel.text = @"";
+ self.ipAddressLabel.text = @"";
+ self.timeLabel.text = @"";
+ self.mtuLabel.text = @"";
+ self.modeLabel.text = @"";
+ self.dataSentLabel.text = @"";
+ self.dataReceivedLabel.text = @"";
+}
+
+// From local progress.
+- (void)setConnectedTime {
+ NSDate *connectedDate = [ArrayVPNManager sharedInstance].tunnelManager.connection.connectedDate;
+ NSString *timeString = [self formatDate:connectedDate];
+
+ self.timeLabel.text = timeString;
+}
+
+// MTU is hard-coded, default value is 1400.
+- (void)setMTU {
+ self.mtuLabel.text = [NSString stringWithFormat:@"%d", VPN_PLUGIN_DEFAULT_MTU];
+}
+
+// From VPN extension.
+- (void)refreshVPNStatusWithPeriod:(NSTimeInterval)period {
+ _timer = [NSTimer timerWithTimeInterval:period
+ target:self
+ selector:@selector(timerHandler)
+ userInfo:nil
+ repeats:YES];
+
+ [[NSRunLoop currentRunLoop]addTimer:_timer forMode:NSDefaultRunLoopMode];
+ [_timer fire];
+}
+
+- (void)timerHandler {
+ if (++_tick == REFRESH_VPN_STATUS_PERIOD) {
+ _tick = 0;
+
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [self setConnectedTime];
+ [self setMTU];
+}
+
+- (void)fetchVPNTunnelStatsInfo {
+ NSError *error = nil;
+
+ NETunnelProviderManager *manager = [[ArrayVPNManager sharedInstance] tunnelManager];
+ NETunnelProviderSession *session = (NETunnelProviderSession *)manager.connection;
+
+ NSDictionary *IPCRequestDict = @{(__bridge NSString *)kIPCType:(__bridge NSString *)kIPCStatsRequest};
+ NSData *IPCRequest = [NSJSONSerialization dataWithJSONObject:IPCRequestDict
+ options:NSJSONWritingPrettyPrinted
+ error:nil];
+
+ __weak typeof(self) weakSelf = self;
+ [session sendProviderMessage:IPCRequest
+ returnError:&error
+ responseHandler:^(NSData * _Nullable responseData) {
+ if (responseData) {
+ ANDebug(@"IPC response received.");
+
+ NSError *error = nil;
+ NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:responseData
+ options:NSJSONReadingMutableContainers
+ error:&error];
+ if (!dict) {
+ ANError(@"Parse IPC response failed with error: %@.", error);
+ return;
+ }
+ NSDictionary *IPCData = [dict objectForKey:(__bridge NSString *)kIPCResponseData];
+ if (responseData != nil) {
+ [weakSelf updateDisplayedVPNStatsWithDict:IPCData];
+ } else {
+ ANError(@"IPC data is not found in response.");
+ }
+ } else {
+ ANError(@"IPC response is nil.");
+ }
+ }];
+ if (error) {
+ ANError(@"Send IPC failed with error: %@.", error.localizedDescription);
+ }
+}
+
+- (void)updateDisplayedVPNStatsWithDict:(NSDictionary *)dict {
+ NSNumber *clientIP = [dict objectForKey:(__bridge NSString *)kIPCStatsClientIP];
+ NSString *serverHost = [dict objectForKey:(__bridge NSString *)kIPCStatsServerHost];
+ NSNumber *sentBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsSentBytes];
+ NSNumber *receivedBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsReceviedBytes];
+ NSNumber *isFullTunnel = [dict objectForKey:(__bridge NSString *)kIPCStatsIsFullTunnel];
+
+ NSString *sentToShow = [self formatBytes:[sentBytes stringValue]];
+ NSString *recvToShow = [self formatBytes:[receivedBytes stringValue]];
+
+ self.ipAddressLabel.text = [self formatIP:clientIP];
+ self.serverLabel.text = serverHost;
+ self.modeLabel.text = [isFullTunnel boolValue] ? NSLocalizedString(@"Full Tunnel", nil) : NSLocalizedString(@"Split Tunnel", nil);
+
+ if (sentToShow) {
+ self.dataSentLabel.text = sentToShow;
+ }
+ if (recvToShow) {
+ self.dataReceivedLabel.text = recvToShow;
+ }
+}
+
+- (void)stopFetchInfo {
+ [_timer invalidate];
+ _timer = nil;
+}
+
+#pragma mark - Helpers
+- (NSString *)formatIP:(NSNumber *)IP {
+ if (!IP) {
+ return @"0.0.0.0";
+ }
+
+ uint32_t ip = [IP unsignedIntValue];
+
+ return [NSString stringWithFormat:@"%d.%d.%d.%d", IPSTR(ip)];
+}
+
+- (NSString *)formatBytes:(NSString *)bytes {
+
+#define K_BYTES 1024
+#define M_BYTES (1024 * 1024)
+
+ if (!bytes) {
+ return nil;
+ }
+
+ uint64_t uBytes = (uint64_t)[bytes integerValue];
+ if (uBytes > M_BYTES) {
+ return [NSString stringWithFormat:@"%.1f MB", (double)uBytes/M_BYTES];
+ } else if (uBytes > K_BYTES) {
+ return [NSString stringWithFormat:@"%.1f KB", (double)uBytes/K_BYTES];
+ }
+
+ return [NSString stringWithFormat:@"%@ B", bytes];
+}
+
+- (NSString *)formatDate:(NSDate *)date {
+ if (!date) {
+ return NSLocalizedString(@"Unconnected", nil);
+ }
+
+ NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+ NSTimeInterval connectedDateInterval = [date timeIntervalSince1970];
+ NSUInteger seconds = (NSUInteger)round(now - connectedDateInterval);
+ NSString *dateString = [NSString stringWithFormat:@"%02zi:%02zi:%02zi",
+ seconds / 3600, (seconds / 60) % 60, seconds % 60];
+
+ return [NSString stringWithFormat:@"%@", dateString];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return kStatusSectionTotal;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if (section == kStatusSectionConnectionInfo) {
+ return 6;
+ } else if (section == kStatusSectionStatistics) {
+ return 2;
+ } else if (section == kStatusSectionDNS){
+ if (_dnsList.count < 16) {
+ return _dnsList.count + 1;
+ } else {
+ return 16;
+ }
+ }
+ return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+
+ if (indexPath.section == kStatusSectionDNS) {
+ DNSSettingCell *dnsSettingCell = [tableView dequeueReusableCellWithIdentifier:kDNSSettingCellID];
+ dnsSettingCell.delegate = self;
+ if (!dnsSettingCell) {
+ dnsSettingCell = [[DNSSettingCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kDNSSettingCellID];;
+ }
+
+ NSInteger row = indexPath.row;
+ if (_dnsList.count < 16) {
+ if (row == 0) {
+ [dnsSettingCell configureCellWithMessage:@"" isAddCell:YES];
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row - 1] isAddCell:NO];
+ }
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row] isAddCell:NO];
+ }
+
+ return dnsSettingCell;
+ } else {
+ cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+ }
+ return cell;
+}
+
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 35;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - DNSSettingCellDelegate
+- (void)DNSSettingButtonDidClickedWithCell:(UITableViewCell *)cell isAdd:(BOOL)bAdd {
+ DNSSettingCell* dnsCell = (DNSSettingCell *)(cell);
+ NSMutableArray *tmpArray = [NSMutableArray arrayWithArray:_dnsList];
+ NSString *errMessage = @"", *titleMessage = @"";
+ if (bAdd) {
+ NSArray *newDnsArray = [dnsCell.addDnsTextField.text componentsSeparatedByString:@";"];
+ BOOL bValidDNSServer = YES;
+ if ([newDnsArray count] > 0) {
+ for (NSString *signalDNS in newDnsArray) {
+ if (!isValidDNSServer([signalDNS UTF8String])) {
+ bValidDNSServer = NO;
+ }
+ }
+ } else {
+ bValidDNSServer = NO;
+ }
+
+ if (bValidDNSServer) {
+ [tmpArray addObjectsFromArray:newDnsArray];
+ } else {
+ errMessage = NSLocalizedString(@"The format of the DNS server is invalid.", nil);
+ titleMessage = NSLocalizedString(@"Error", nil);
+ }
+ } else {
+ [tmpArray removeObject:dnsCell.descText.text];
+ if([tmpArray count] <= 0) {
+ errMessage = NSLocalizedString(@"Make sure at least one DNS server exists in the system.", nil);
+ titleMessage = NSLocalizedString(@"Information", nil);
+ }
+ }
+
+ if ([errMessage length] > 0) {
+ PopupDialog *popup = [ANPopupDialog singleButtonPopupDialogWithTitle:titleMessage message:errMessage];
+ [self presentViewController:popup animated:YES completion:nil];
+ return;
+ }
+ _dnsList = tmpArray;
+ ANInfo(@"new dns list=%@", _dnsList);
+ [self.tableView reloadData];
+
+ NSString *dnsListString = [_dnsList componentsJoinedByString:@";"];
+ Gateway *currentGateway = [self getCurrentGateway];
+ currentGateway.customDnsList = dnsListString;
+ ANInfo(@"save current gateway custom dns list=%@", currentGateway.customDnsList);
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ [gatewayManager updateGateway:currentGateway];
+ self.needReconnect = YES;
+ [self stopVPN];
+}
+
+- (Gateway *)getCurrentGateway {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ if ([url length] <= 0) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length > 0) {
+ ANInfo(@"getCurrentGateway: Get oauth url[%@].", oauthUrl);
+ NSRange range = [oauthUrl rangeOfString:@"https://"];
+ oauthUrl = [oauthUrl substringFromIndex:range.location + range.length];
+ range = [oauthUrl rangeOfString:@"/prx/000/"];
+ url = [oauthUrl substringToIndex:range.location];
+ ANInfo(@"getCurrentGateway: Get url[%@].", url);
+ }
+ }
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.MotionPro
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.MotionPro (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.MotionPro (working copy)
@@ -0,0 +1,509 @@
+//
+// StatusViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+#include
+#import "ANLogger.h"
+#import "arrayapi.h"
+#import "vpnplugin.h"
+#import "ArrayVPNManager.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "StatusViewController.h"
+#import "DNSSettingCell.h"
+#import "UIViewController+HideKeyboard.h"
+
+BOOL isValidDNSServer(const char *dnsServer);
+
+BOOL isValidDNSServer(const char *dnsServer)
+{
+ if (!dnsServer) {
+ return NO;
+ }
+
+ struct sockaddr_in sa;
+ int result = inet_pton(AF_INET, dnsServer, &(sa.sin_addr));
+ return result != 0;
+}
+
+#define SECTIONS_IN_STATUS_VIEW 2
+#define ROWS_IN_SECTION_CONNECTION_INFO 6
+#define ROWS_IN_SECIONT_STATISTICS 2
+
+typedef NS_ENUM(NSInteger, StatusSectionIndex) {
+ kStatusSectionConnectionInfo = 0,
+ kStatusSectionDNS,
+ kStatusSectionStatistics,
+ kStatusSectionTotal
+};
+
+#define TIMER_PERIOD 1
+#define REFRESH_VPN_STATUS_PERIOD 3
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameStatus = @"group.net.arraynetworks.MotionPro";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameStatus = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+@interface StatusViewController () {
+ NSTimer *_timer;
+ NSInteger _tick;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *stateLabel;
+@property (weak, nonatomic) IBOutlet UILabel *serverLabel;
+@property (weak, nonatomic) IBOutlet UILabel *ipAddressLabel;
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *mtuLabel;
+@property (weak, nonatomic) IBOutlet UILabel *modeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataSentLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataReceivedLabel;
+@property (strong, nonatomic) NSMutableArray *dnsList;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation StatusViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+
+ [self.tableView registerNib:[UINib nibWithNibName:@"DNSSettingCell" bundle:nil] forCellReuseIdentifier:kDNSSettingCellID];
+ self.needReconnect = NO;
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"viewDidLoad:get new dns list[%@]", newDNSList);
+ if (newDNSList.count > 0) {
+ [userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"viewDidLoad:get dns list= %@", _dnsList);
+ }
+
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [self setVPNStatus];
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self setMTU];
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [self stopFetchInfo];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - All Status Information
+- (void)setVPNStatus {
+ NSString *statusString = @"";
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ switch (tunnelStatus) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnecting:
+ case ArrayVPNDisconnected:
+ statusString = NSLocalizedString(@"Disconnected", nil);
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ statusString = NSLocalizedString(@"Connecting...", nil);
+ break;
+ case ArrayVPNConnected:
+ statusString = NSLocalizedString(@"Connected", nil);
+ break;
+ default:
+ ANError(@"Invalid VPN tunnel status \(%zi).", tunnelStatus);
+ break;
+ }
+
+ self.stateLabel.text = statusString;
+}
+
+// VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANInfo(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+ [self stopFetchInfo];
+ if (self.needReconnect && tunnelStatus == ArrayVPNDisconnected) {
+ ANInfo(@"custom dns server config, now need restart vpn.");
+ self.needReconnect = NO;
+ [self startVPN:NO];
+ }
+ } else {
+ if (_timer == nil) {
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+ ANInfo(@"Array VPN tunnel status is connected");
+ if (tunnelStatus == ArrayVPNConnected) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ for (int i = 0; i < 3; i++) {
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"get new dns list[%@], i =%d", newDNSList, i);
+ if (newDNSList.count > 0) {
+ //[userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"status connected:get dns list= %@", _dnsList);
+ [self.tableView reloadData];
+ break;
+ } else {
+ sleep(1);
+ }
+ }
+ }
+ }
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+ return YES;
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+// Clear all statistics information if vpn is not connected.
+- (BOOL)clearVPNInfoIfNotConnected {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+
+ return YES;
+ }
+
+ return NO;
+}
+
+- (void)clearVPNInfo {
+ self.serverLabel.text = @"";
+ self.ipAddressLabel.text = @"";
+ self.timeLabel.text = @"";
+ self.mtuLabel.text = @"";
+ self.modeLabel.text = @"";
+ self.dataSentLabel.text = @"";
+ self.dataReceivedLabel.text = @"";
+}
+
+// From local progress.
+- (void)setConnectedTime {
+ NSDate *connectedDate = [ArrayVPNManager sharedInstance].tunnelManager.connection.connectedDate;
+ NSString *timeString = [self formatDate:connectedDate];
+
+ self.timeLabel.text = timeString;
+}
+
+// MTU is hard-coded, default value is 1400.
+- (void)setMTU {
+ self.mtuLabel.text = [NSString stringWithFormat:@"%d", VPN_PLUGIN_DEFAULT_MTU];
+}
+
+// From VPN extension.
+- (void)refreshVPNStatusWithPeriod:(NSTimeInterval)period {
+ _timer = [NSTimer timerWithTimeInterval:period
+ target:self
+ selector:@selector(timerHandler)
+ userInfo:nil
+ repeats:YES];
+
+ [[NSRunLoop currentRunLoop]addTimer:_timer forMode:NSDefaultRunLoopMode];
+ [_timer fire];
+}
+
+- (void)timerHandler {
+ if (++_tick == REFRESH_VPN_STATUS_PERIOD) {
+ _tick = 0;
+
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [self setConnectedTime];
+ [self setMTU];
+}
+
+- (void)fetchVPNTunnelStatsInfo {
+ NSError *error = nil;
+
+ NETunnelProviderManager *manager = [[ArrayVPNManager sharedInstance] tunnelManager];
+ NETunnelProviderSession *session = (NETunnelProviderSession *)manager.connection;
+
+ NSDictionary *IPCRequestDict = @{(__bridge NSString *)kIPCType:(__bridge NSString *)kIPCStatsRequest};
+ NSData *IPCRequest = [NSJSONSerialization dataWithJSONObject:IPCRequestDict
+ options:NSJSONWritingPrettyPrinted
+ error:nil];
+
+ __weak typeof(self) weakSelf = self;
+ [session sendProviderMessage:IPCRequest
+ returnError:&error
+ responseHandler:^(NSData * _Nullable responseData) {
+ if (responseData) {
+ ANDebug(@"IPC response received.");
+
+ NSError *error = nil;
+ NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:responseData
+ options:NSJSONReadingMutableContainers
+ error:&error];
+ if (!dict) {
+ ANError(@"Parse IPC response failed with error: %@.", error);
+ return;
+ }
+ NSDictionary *IPCData = [dict objectForKey:(__bridge NSString *)kIPCResponseData];
+ if (responseData != nil) {
+ [weakSelf updateDisplayedVPNStatsWithDict:IPCData];
+ } else {
+ ANError(@"IPC data is not found in response.");
+ }
+ } else {
+ ANError(@"IPC response is nil.");
+ }
+ }];
+ if (error) {
+ ANError(@"Send IPC failed with error: %@.", error.localizedDescription);
+ }
+}
+
+- (void)updateDisplayedVPNStatsWithDict:(NSDictionary *)dict {
+ NSNumber *clientIP = [dict objectForKey:(__bridge NSString *)kIPCStatsClientIP];
+ NSString *serverHost = [dict objectForKey:(__bridge NSString *)kIPCStatsServerHost];
+ NSNumber *sentBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsSentBytes];
+ NSNumber *receivedBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsReceviedBytes];
+ NSNumber *isFullTunnel = [dict objectForKey:(__bridge NSString *)kIPCStatsIsFullTunnel];
+
+ NSString *sentToShow = [self formatBytes:[sentBytes stringValue]];
+ NSString *recvToShow = [self formatBytes:[receivedBytes stringValue]];
+
+ self.ipAddressLabel.text = [self formatIP:clientIP];
+ self.serverLabel.text = serverHost;
+ self.modeLabel.text = [isFullTunnel boolValue] ? NSLocalizedString(@"Full Tunnel", nil) : NSLocalizedString(@"Split Tunnel", nil);
+
+ if (sentToShow) {
+ self.dataSentLabel.text = sentToShow;
+ }
+ if (recvToShow) {
+ self.dataReceivedLabel.text = recvToShow;
+ }
+}
+
+- (void)stopFetchInfo {
+ [_timer invalidate];
+ _timer = nil;
+}
+
+#pragma mark - Helpers
+- (NSString *)formatIP:(NSNumber *)IP {
+ if (!IP) {
+ return @"0.0.0.0";
+ }
+
+ uint32_t ip = [IP unsignedIntValue];
+
+ return [NSString stringWithFormat:@"%d.%d.%d.%d", IPSTR(ip)];
+}
+
+- (NSString *)formatBytes:(NSString *)bytes {
+
+#define K_BYTES 1024
+#define M_BYTES (1024 * 1024)
+
+ if (!bytes) {
+ return nil;
+ }
+
+ uint64_t uBytes = (uint64_t)[bytes integerValue];
+ if (uBytes > M_BYTES) {
+ return [NSString stringWithFormat:@"%.1f MB", (double)uBytes/M_BYTES];
+ } else if (uBytes > K_BYTES) {
+ return [NSString stringWithFormat:@"%.1f KB", (double)uBytes/K_BYTES];
+ }
+
+ return [NSString stringWithFormat:@"%@ B", bytes];
+}
+
+- (NSString *)formatDate:(NSDate *)date {
+ if (!date) {
+ return NSLocalizedString(@"Unconnected", nil);
+ }
+
+ NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+ NSTimeInterval connectedDateInterval = [date timeIntervalSince1970];
+ NSUInteger seconds = (NSUInteger)round(now - connectedDateInterval);
+ NSString *dateString = [NSString stringWithFormat:@"%02zi:%02zi:%02zi",
+ seconds / 3600, (seconds / 60) % 60, seconds % 60];
+
+ return [NSString stringWithFormat:@"%@", dateString];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return kStatusSectionTotal;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if (section == kStatusSectionConnectionInfo) {
+ return 6;
+ } else if (section == kStatusSectionStatistics) {
+ return 2;
+ } else if (section == kStatusSectionDNS){
+ if (_dnsList.count < 16) {
+ return _dnsList.count + 1;
+ } else {
+ return 16;
+ }
+ }
+ return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+
+ if (indexPath.section == kStatusSectionDNS) {
+ DNSSettingCell *dnsSettingCell = [tableView dequeueReusableCellWithIdentifier:kDNSSettingCellID];
+ dnsSettingCell.delegate = self;
+ if (!dnsSettingCell) {
+ dnsSettingCell = [[DNSSettingCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kDNSSettingCellID];;
+ }
+
+ NSInteger row = indexPath.row;
+ if (_dnsList.count < 16) {
+ if (row == 0) {
+ [dnsSettingCell configureCellWithMessage:@"" isAddCell:YES];
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row - 1] isAddCell:NO];
+ }
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row] isAddCell:NO];
+ }
+
+ return dnsSettingCell;
+ } else {
+ cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+ }
+ return cell;
+}
+
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 35;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - DNSSettingCellDelegate
+- (void)DNSSettingButtonDidClickedWithCell:(UITableViewCell *)cell isAdd:(BOOL)bAdd {
+ DNSSettingCell* dnsCell = (DNSSettingCell *)(cell);
+ NSMutableArray *tmpArray = [NSMutableArray arrayWithArray:_dnsList];
+ NSString *errMessage = @"", *titleMessage = @"";
+ if (bAdd) {
+ NSArray *newDnsArray = [dnsCell.addDnsTextField.text componentsSeparatedByString:@";"];
+ BOOL bValidDNSServer = YES;
+ if ([newDnsArray count] > 0) {
+ for (NSString *signalDNS in newDnsArray) {
+ if (!isValidDNSServer([signalDNS UTF8String])) {
+ bValidDNSServer = NO;
+ }
+ }
+ } else {
+ bValidDNSServer = NO;
+ }
+
+ if (bValidDNSServer) {
+ [tmpArray addObjectsFromArray:newDnsArray];
+ } else {
+ errMessage = NSLocalizedString(@"The format of the DNS server is invalid.", nil);
+ titleMessage = NSLocalizedString(@"Error", nil);
+ }
+ } else {
+ [tmpArray removeObject:dnsCell.descText.text];
+ if([tmpArray count] <= 0) {
+ errMessage = NSLocalizedString(@"Make sure at least one DNS server exists in the system.", nil);
+ titleMessage = NSLocalizedString(@"Information", nil);
+ }
+ }
+
+ if ([errMessage length] > 0) {
+ PopupDialog *popup = [ANPopupDialog singleButtonPopupDialogWithTitle:titleMessage message:errMessage];
+ [self presentViewController:popup animated:YES completion:nil];
+ return;
+ }
+ _dnsList = tmpArray;
+ ANInfo(@"new dns list=%@", _dnsList);
+ [self.tableView reloadData];
+
+ NSString *dnsListString = [_dnsList componentsJoinedByString:@";"];
+ Gateway *currentGateway = [self getCurrentGateway];
+ currentGateway.customDnsList = dnsListString;
+ ANInfo(@"save current gateway custom dns list=%@", currentGateway.customDnsList);
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ [gatewayManager updateGateway:currentGateway];
+ self.needReconnect = YES;
+ [self stopVPN];
+}
+
+- (Gateway *)getCurrentGateway {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ if ([url length] <= 0) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length > 0) {
+ ANInfo(@"getCurrentGateway: Get oauth url[%@].", oauthUrl);
+ NSRange range = [oauthUrl rangeOfString:@"https://"];
+ oauthUrl = [oauthUrl substringFromIndex:range.location + range.length];
+ range = [oauthUrl rangeOfString:@"/prx/000/"];
+ url = [oauthUrl substringToIndex:range.location];
+ ANInfo(@"getCurrentGateway: Get url[%@].", url);
+ }
+ }
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.MotionProEnterprise
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.MotionProEnterprise (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/StatusViewController.m.MotionProEnterprise (working copy)
@@ -0,0 +1,509 @@
+//
+// StatusViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/7/27.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+#include
+#import "ANLogger.h"
+#import "arrayapi.h"
+#import "vpnplugin.h"
+#import "ArrayVPNManager.h"
+#import "ArrayVPNWrapper.h"
+#import "ANPopupDialog.h"
+#import "AAAManager.h"
+#import "GatewayManager.h"
+#import "StatusViewController.h"
+#import "DNSSettingCell.h"
+#import "UIViewController+HideKeyboard.h"
+
+BOOL isValidDNSServer(const char *dnsServer);
+
+BOOL isValidDNSServer(const char *dnsServer)
+{
+ if (!dnsServer) {
+ return NO;
+ }
+
+ struct sockaddr_in sa;
+ int result = inet_pton(AF_INET, dnsServer, &(sa.sin_addr));
+ return result != 0;
+}
+
+#define SECTIONS_IN_STATUS_VIEW 2
+#define ROWS_IN_SECTION_CONNECTION_INFO 6
+#define ROWS_IN_SECIONT_STATISTICS 2
+
+typedef NS_ENUM(NSInteger, StatusSectionIndex) {
+ kStatusSectionConnectionInfo = 0,
+ kStatusSectionDNS,
+ kStatusSectionStatistics,
+ kStatusSectionTotal
+};
+
+#define TIMER_PERIOD 1
+#define REFRESH_VPN_STATUS_PERIOD 3
+
+#if TARGET_OS_IPHONE
+NSString * const kAppGroupNameStatus = @"group.net.arraynetworks.groupenterprise";
+#elif TARGET_OS_MAC
+NSString * const kAppGroupNameStatus = @"5VZLZ3YQ9P.net.arraynetworks.MacTunnel";
+#endif
+
+@interface StatusViewController () {
+ NSTimer *_timer;
+ NSInteger _tick;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *stateLabel;
+@property (weak, nonatomic) IBOutlet UILabel *serverLabel;
+@property (weak, nonatomic) IBOutlet UILabel *ipAddressLabel;
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *mtuLabel;
+@property (weak, nonatomic) IBOutlet UILabel *modeLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataSentLabel;
+@property (weak, nonatomic) IBOutlet UILabel *dataReceivedLabel;
+@property (strong, nonatomic) NSMutableArray *dnsList;
+@property (nonatomic) BOOL needReconnect;
+
+@end
+
+@implementation StatusViewController
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self enableHideKeyboard];
+
+ [self.tableView registerNib:[UINib nibWithNibName:@"DNSSettingCell" bundle:nil] forCellReuseIdentifier:kDNSSettingCellID];
+ self.needReconnect = NO;
+
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"viewDidLoad:get new dns list[%@]", newDNSList);
+ if (newDNSList.count > 0) {
+ [userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"viewDidLoad:get dns list= %@", _dnsList);
+ }
+
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(handleVPNStatus:)
+ name:kArrayVPNStatusNotification
+ object:nil];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [self setVPNStatus];
+ if (![self clearVPNInfoIfNotConnected]) {
+ [self setMTU];
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [self stopFetchInfo];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - All Status Information
+- (void)setVPNStatus {
+ NSString *statusString = @"";
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ switch (tunnelStatus) {
+ case ArrayVPNInavlid:
+ case ArrayVPNDisconnecting:
+ case ArrayVPNDisconnected:
+ statusString = NSLocalizedString(@"Disconnected", nil);
+ break;
+ case ArrayVPNConnecting:
+ case ArrayVPNReasserting:
+ statusString = NSLocalizedString(@"Connecting...", nil);
+ break;
+ case ArrayVPNConnected:
+ statusString = NSLocalizedString(@"Connected", nil);
+ break;
+ default:
+ ANError(@"Invalid VPN tunnel status \(%zi).", tunnelStatus);
+ break;
+ }
+
+ self.stateLabel.text = statusString;
+}
+
+// VPN Status Handler
+- (void)handleVPNStatus:(NSNotification *)notification {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+
+ ANInfo(@"Array VPN tunnel status = %zi", tunnelStatus);
+
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+ [self stopFetchInfo];
+ if (self.needReconnect && tunnelStatus == ArrayVPNDisconnected) {
+ ANInfo(@"custom dns server config, now need restart vpn.");
+ self.needReconnect = NO;
+ [self startVPN:NO];
+ }
+ } else {
+ if (_timer == nil) {
+ [self refreshVPNStatusWithPeriod:TIMER_PERIOD];
+ }
+ ANInfo(@"Array VPN tunnel status is connected");
+ if (tunnelStatus == ArrayVPNConnected) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ for (int i = 0; i < 3; i++) {
+ NSMutableArray *newDNSList = [userDefaults valueForKey:@"dns_list"];
+ ANInfo(@"get new dns list[%@], i =%d", newDNSList, i);
+ if (newDNSList.count > 0) {
+ //[userDefaults removeObjectForKey:@"dns_list"];
+ _dnsList = newDNSList;
+ ANInfo(@"status connected:get dns list= %@", _dnsList);
+ [self.tableView reloadData];
+ break;
+ } else {
+ sleep(1);
+ }
+ }
+ }
+ }
+}
+
+- (BOOL)startVPN:(BOOL)isAutoStart {
+ //Gateway *gateway = [self getCurrentGateway];
+ //NSString *session = [AAAManager sharedInstance].sessionID;
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+
+#if TARGET_OS_IPHONE
+ //Reset connect fail reason.
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ [userDefaults removeObjectForKey:@"tunnel_result"];
+ [userDefaults removeObjectForKey:@"dns_list"];
+#endif
+
+ [vpnWrapper startSSLVPN];
+
+ return YES;
+}
+
+- (void)stopVPN {
+ ArrayVPNWrapper *vpnWrapper = [ArrayVPNWrapper sharedInstance];
+ [vpnWrapper stopSSLVPN];
+}
+
+// Clear all statistics information if vpn is not connected.
+- (BOOL)clearVPNInfoIfNotConnected {
+ ArrayVPNStatus tunnelStatus = [ArrayVPNManager sharedInstance].vpnStatus;
+ if (tunnelStatus != ArrayVPNConnected) {
+ [self clearVPNInfo];
+
+ return YES;
+ }
+
+ return NO;
+}
+
+- (void)clearVPNInfo {
+ self.serverLabel.text = @"";
+ self.ipAddressLabel.text = @"";
+ self.timeLabel.text = @"";
+ self.mtuLabel.text = @"";
+ self.modeLabel.text = @"";
+ self.dataSentLabel.text = @"";
+ self.dataReceivedLabel.text = @"";
+}
+
+// From local progress.
+- (void)setConnectedTime {
+ NSDate *connectedDate = [ArrayVPNManager sharedInstance].tunnelManager.connection.connectedDate;
+ NSString *timeString = [self formatDate:connectedDate];
+
+ self.timeLabel.text = timeString;
+}
+
+// MTU is hard-coded, default value is 1400.
+- (void)setMTU {
+ self.mtuLabel.text = [NSString stringWithFormat:@"%d", VPN_PLUGIN_DEFAULT_MTU];
+}
+
+// From VPN extension.
+- (void)refreshVPNStatusWithPeriod:(NSTimeInterval)period {
+ _timer = [NSTimer timerWithTimeInterval:period
+ target:self
+ selector:@selector(timerHandler)
+ userInfo:nil
+ repeats:YES];
+
+ [[NSRunLoop currentRunLoop]addTimer:_timer forMode:NSDefaultRunLoopMode];
+ [_timer fire];
+}
+
+- (void)timerHandler {
+ if (++_tick == REFRESH_VPN_STATUS_PERIOD) {
+ _tick = 0;
+
+ [self fetchVPNTunnelStatsInfo];
+ }
+
+ [self setConnectedTime];
+ [self setMTU];
+}
+
+- (void)fetchVPNTunnelStatsInfo {
+ NSError *error = nil;
+
+ NETunnelProviderManager *manager = [[ArrayVPNManager sharedInstance] tunnelManager];
+ NETunnelProviderSession *session = (NETunnelProviderSession *)manager.connection;
+
+ NSDictionary *IPCRequestDict = @{(__bridge NSString *)kIPCType:(__bridge NSString *)kIPCStatsRequest};
+ NSData *IPCRequest = [NSJSONSerialization dataWithJSONObject:IPCRequestDict
+ options:NSJSONWritingPrettyPrinted
+ error:nil];
+
+ __weak typeof(self) weakSelf = self;
+ [session sendProviderMessage:IPCRequest
+ returnError:&error
+ responseHandler:^(NSData * _Nullable responseData) {
+ if (responseData) {
+ ANDebug(@"IPC response received.");
+
+ NSError *error = nil;
+ NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:responseData
+ options:NSJSONReadingMutableContainers
+ error:&error];
+ if (!dict) {
+ ANError(@"Parse IPC response failed with error: %@.", error);
+ return;
+ }
+ NSDictionary *IPCData = [dict objectForKey:(__bridge NSString *)kIPCResponseData];
+ if (responseData != nil) {
+ [weakSelf updateDisplayedVPNStatsWithDict:IPCData];
+ } else {
+ ANError(@"IPC data is not found in response.");
+ }
+ } else {
+ ANError(@"IPC response is nil.");
+ }
+ }];
+ if (error) {
+ ANError(@"Send IPC failed with error: %@.", error.localizedDescription);
+ }
+}
+
+- (void)updateDisplayedVPNStatsWithDict:(NSDictionary *)dict {
+ NSNumber *clientIP = [dict objectForKey:(__bridge NSString *)kIPCStatsClientIP];
+ NSString *serverHost = [dict objectForKey:(__bridge NSString *)kIPCStatsServerHost];
+ NSNumber *sentBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsSentBytes];
+ NSNumber *receivedBytes = [dict objectForKey:(__bridge NSString *)kIPCStatsReceviedBytes];
+ NSNumber *isFullTunnel = [dict objectForKey:(__bridge NSString *)kIPCStatsIsFullTunnel];
+
+ NSString *sentToShow = [self formatBytes:[sentBytes stringValue]];
+ NSString *recvToShow = [self formatBytes:[receivedBytes stringValue]];
+
+ self.ipAddressLabel.text = [self formatIP:clientIP];
+ self.serverLabel.text = serverHost;
+ self.modeLabel.text = [isFullTunnel boolValue] ? NSLocalizedString(@"Full Tunnel", nil) : NSLocalizedString(@"Split Tunnel", nil);
+
+ if (sentToShow) {
+ self.dataSentLabel.text = sentToShow;
+ }
+ if (recvToShow) {
+ self.dataReceivedLabel.text = recvToShow;
+ }
+}
+
+- (void)stopFetchInfo {
+ [_timer invalidate];
+ _timer = nil;
+}
+
+#pragma mark - Helpers
+- (NSString *)formatIP:(NSNumber *)IP {
+ if (!IP) {
+ return @"0.0.0.0";
+ }
+
+ uint32_t ip = [IP unsignedIntValue];
+
+ return [NSString stringWithFormat:@"%d.%d.%d.%d", IPSTR(ip)];
+}
+
+- (NSString *)formatBytes:(NSString *)bytes {
+
+#define K_BYTES 1024
+#define M_BYTES (1024 * 1024)
+
+ if (!bytes) {
+ return nil;
+ }
+
+ uint64_t uBytes = (uint64_t)[bytes integerValue];
+ if (uBytes > M_BYTES) {
+ return [NSString stringWithFormat:@"%.1f MB", (double)uBytes/M_BYTES];
+ } else if (uBytes > K_BYTES) {
+ return [NSString stringWithFormat:@"%.1f KB", (double)uBytes/K_BYTES];
+ }
+
+ return [NSString stringWithFormat:@"%@ B", bytes];
+}
+
+- (NSString *)formatDate:(NSDate *)date {
+ if (!date) {
+ return NSLocalizedString(@"Unconnected", nil);
+ }
+
+ NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+ NSTimeInterval connectedDateInterval = [date timeIntervalSince1970];
+ NSUInteger seconds = (NSUInteger)round(now - connectedDateInterval);
+ NSString *dateString = [NSString stringWithFormat:@"%02zi:%02zi:%02zi",
+ seconds / 3600, (seconds / 60) % 60, seconds % 60];
+
+ return [NSString stringWithFormat:@"%@", dateString];
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return kStatusSectionTotal;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if (section == kStatusSectionConnectionInfo) {
+ return 6;
+ } else if (section == kStatusSectionStatistics) {
+ return 2;
+ } else if (section == kStatusSectionDNS){
+ if (_dnsList.count < 16) {
+ return _dnsList.count + 1;
+ } else {
+ return 16;
+ }
+ }
+ return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+
+ if (indexPath.section == kStatusSectionDNS) {
+ DNSSettingCell *dnsSettingCell = [tableView dequeueReusableCellWithIdentifier:kDNSSettingCellID];
+ dnsSettingCell.delegate = self;
+ if (!dnsSettingCell) {
+ dnsSettingCell = [[DNSSettingCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kDNSSettingCellID];;
+ }
+
+ NSInteger row = indexPath.row;
+ if (_dnsList.count < 16) {
+ if (row == 0) {
+ [dnsSettingCell configureCellWithMessage:@"" isAddCell:YES];
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row - 1] isAddCell:NO];
+ }
+ } else {
+ [dnsSettingCell configureCellWithMessage:[_dnsList objectAtIndex:row] isAddCell:NO];
+ }
+
+ return dnsSettingCell;
+ } else {
+ cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+ }
+ return cell;
+}
+
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 35;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+#pragma mark - DNSSettingCellDelegate
+- (void)DNSSettingButtonDidClickedWithCell:(UITableViewCell *)cell isAdd:(BOOL)bAdd {
+ DNSSettingCell* dnsCell = (DNSSettingCell *)(cell);
+ NSMutableArray *tmpArray = [NSMutableArray arrayWithArray:_dnsList];
+ NSString *errMessage = @"", *titleMessage = @"";
+ if (bAdd) {
+ NSArray *newDnsArray = [dnsCell.addDnsTextField.text componentsSeparatedByString:@";"];
+ BOOL bValidDNSServer = YES;
+ if ([newDnsArray count] > 0) {
+ for (NSString *signalDNS in newDnsArray) {
+ if (!isValidDNSServer([signalDNS UTF8String])) {
+ bValidDNSServer = NO;
+ }
+ }
+ } else {
+ bValidDNSServer = NO;
+ }
+
+ if (bValidDNSServer) {
+ [tmpArray addObjectsFromArray:newDnsArray];
+ } else {
+ errMessage = NSLocalizedString(@"The format of the DNS server is invalid.", nil);
+ titleMessage = NSLocalizedString(@"Error", nil);
+ }
+ } else {
+ [tmpArray removeObject:dnsCell.descText.text];
+ if([tmpArray count] <= 0) {
+ errMessage = NSLocalizedString(@"Make sure at least one DNS server exists in the system.", nil);
+ titleMessage = NSLocalizedString(@"Information", nil);
+ }
+ }
+
+ if ([errMessage length] > 0) {
+ PopupDialog *popup = [ANPopupDialog singleButtonPopupDialogWithTitle:titleMessage message:errMessage];
+ [self presentViewController:popup animated:YES completion:nil];
+ return;
+ }
+ _dnsList = tmpArray;
+ ANInfo(@"new dns list=%@", _dnsList);
+ [self.tableView reloadData];
+
+ NSString *dnsListString = [_dnsList componentsJoinedByString:@";"];
+ Gateway *currentGateway = [self getCurrentGateway];
+ currentGateway.customDnsList = dnsListString;
+ ANInfo(@"save current gateway custom dns list=%@", currentGateway.customDnsList);
+ GatewayManager *gatewayManager = [GatewayManager sharedInstance];
+ [gatewayManager updateGateway:currentGateway];
+ self.needReconnect = YES;
+ [self stopVPN];
+}
+
+- (Gateway *)getCurrentGateway {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *account = manager.account;
+ GatewayManager *gm = [GatewayManager sharedInstance];
+ NSString *url = account.vsURL;
+ NSString *port = account.vsPort;
+ if ([url length] <= 0) {
+ NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:kAppGroupNameStatus];
+ NSString *oauthUrl = [userDefaults valueForKey:KEY_OAUTH_URL];
+ if (oauthUrl.length > 0) {
+ ANInfo(@"getCurrentGateway: Get oauth url[%@].", oauthUrl);
+ NSRange range = [oauthUrl rangeOfString:@"https://"];
+ oauthUrl = [oauthUrl substringFromIndex:range.location + range.length];
+ range = [oauthUrl rangeOfString:@"/prx/000/"];
+ url = [oauthUrl substringToIndex:range.location];
+ ANInfo(@"getCurrentGateway: Get url[%@].", url);
+ }
+ }
+ NSInteger index = [gm indexOfUrl:url andport:port];
+
+ return [gm gatewayAtIndex:index];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SubResourceViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SubResourceViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SubResourceViewController.h (working copy)
@@ -0,0 +1,15 @@
+//
+// SubResourceViewController.h
+// MacTunnel
+//
+// Created by wangxy on 2017/8/4.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface SubResourceViewController : UITableViewController
+
+- (void)setupModel:(NSArray *)model;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SubResourceViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SubResourceViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SubResourceViewController.m (working copy)
@@ -0,0 +1,367 @@
+//
+// SubResourceViewController.m
+// MacTunnel
+//
+// Created by wangxy on 2017/8/4.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "Global.h"
+#import "ResourceCell.h"
+#import "NativeAppCell.h"
+#import "ResourceItem.h"
+#import "AppManager.h"
+#import "GCustomItem.h"
+#import "PubAppItem.h"
+#import "ANPopupDialog.h"
+#import "FBKVOController.h"
+#import "ANLogger.h"
+#import "ZTWKWebViewController.h"
+#import "SubResourceViewController.h"
+
+static NSString * const kSubResourceStoryBoardID = @"SubResourceViewControllerID";
+
+@interface SubResourceViewController () {
+ NSInteger _longPressedIndex;
+}
+
+@property (nonatomic, strong) NSArray *model;
+@property (nonatomic, strong) id browser;
+
+// For DesktopDirect
+@property (nonatomic, strong) NSIndexPath *currentIndex;
+@property (nonatomic, strong) ResourceItem *currentItem;
+@property (nonatomic, strong) FBKVOController *kvoController;
+@property (nonatomic, strong) UIControl *darkView;
+@property (nonatomic) BOOL silence;
+
+@end
+
+@implementation SubResourceViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self registerCells];
+
+ [self initKVOController];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)setupModel:(NSArray *)model {
+ self.model = model;
+}
+
+- (void)registerCells {
+ [self.tableView registerNib:[UINib nibWithNibName:@"ResourceCell" bundle:nil] forCellReuseIdentifier:kResourceCellID];
+ [self.tableView registerNib:[UINib nibWithNibName:@"NativeAppCell" bundle:nil] forCellReuseIdentifier:kNativeAppCellID];
+}
+
+- (void)initKVOController {
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+}
+
+- (UITableViewCell *)configureWebAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.tableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ WebApp *app = [self.model objectAtIndex:row];
+ UIImage *image = nil;
+ BOOL isFolder = app.type == APP_TYPE_FOLDER;
+ if (isFolder) {
+ image = [UIImage imageNamed:FOLDER_APP_IMAGE_NAME];
+ } else {
+ image = [UIImage imageNamed:WEB_APP_IMAGE_NAME];
+ UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+ action:@selector(cellLongPressed:)];
+ [cell addGestureRecognizer:longPressGesture];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:isFolder];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureNativeAppWithRow:(NSInteger)row {
+ NativeAppCell *cell = [self.tableView dequeueReusableCellWithIdentifier:kNativeAppCellID];
+ if (!cell) {
+ cell = [[NativeAppCell alloc] init];
+ }
+
+ NativeApp *app = [self.model objectAtIndex:row];
+ UIImage *image = nil;
+ if (app.customIcon) {
+ image = app.customIcon;
+ } else if (app.appIcon) {
+ image = app.appIcon;
+ } else {
+ image = [UIImage imageNamed:NATIVE_APP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:app.name isFolder:NO];
+ [cell setDescriptionContent:app.desc];
+
+ return cell;
+}
+
+- (UITableViewCell *)configureDesktopAppWithRow:(NSInteger)row {
+ ResourceCell *cell = [self.tableView dequeueReusableCellWithIdentifier:kResourceCellID];
+ if (!cell) {
+ cell = [[ResourceCell alloc] init];
+ }
+
+ FolderItem *item = [self.model objectAtIndex:row];
+ BOOL isFolder = [item isKindOfClass:[FolderItem class]]; // Only pub-app & self-defined desktop has folder.
+ BOOL isCustomDesktop = [item isKindOfClass:[GCustomItem class]];
+ if (isCustomDesktop) {
+ isFolder = YES;
+ }
+ UIImage *image = nil;
+ if (item.icon != nil) {
+ image = item.icon;
+ } else {
+ image = (isFolder && !isCustomDesktop) ? [UIImage imageNamed:FOLDER_APP_IMAGE_NAME] : [UIImage imageNamed:DESKTOP_IMAGE_NAME];
+ }
+ [cell configureCellWithImage:image name:item.name isFolder:isFolder];
+
+ return cell;
+}
+
+#pragma mark - Long press handler for WebApp
+- (void)cellLongPressed:(UIGestureRecognizer *)recognizer {
+ if (recognizer.state == UIGestureRecognizerStateBegan) {
+ CGPoint location = [recognizer locationInView:self.tableView];
+ NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:location];
+ _longPressedIndex = indexPath.row;
+ ResourceCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
+
+ [self showMenuWithCell:cell];
+ }
+}
+
+- (void)showMenuWithCell:(ResourceCell *)cell {
+ [cell becomeFirstResponder];
+
+ UIMenuController *controller = [UIMenuController sharedMenuController];
+ UIMenuItem *openItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Open in Safari", nil) action:@selector(openWebPage:)];
+ [controller setMenuItems:[NSArray arrayWithObjects:openItem, nil]];
+ [controller setTargetRect:cell.contentView.frame inView:cell.contentView];
+ [controller setMenuVisible:YES animated:YES];
+}
+
+- (void)openWebPage:(id)sender {
+ if (_longPressedIndex >= self.model.count) {
+ ANError(@"Index (%zi) is out range of web apps count.", _longPressedIndex);
+ return;
+ }
+
+ WebApp *app = [self.model objectAtIndex:_longPressedIndex];
+ if (app.type == APP_TYPE_WEBAPP) {
+ [[UIApplication sharedApplication] openURL:app.url];
+ }
+}
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return self.model.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ UITableViewCell *cell = nil;
+ NSInteger row = indexPath.row;
+ id app = [self.model objectAtIndex:row];
+ if ([app isKindOfClass:[ResourceApp class]]) {
+ APP_TYPE type = ((ResourceApp *)app).type;
+ if (type == APP_TYPE_WEBAPP || type == APP_TYPE_FOLDER) {
+ cell = [self configureWebAppWithRow:row];
+ } else if (type == APP_TYPE_NATIVEAPP || type == APP_TYPE_NATIVE_SDK) {
+ cell = [self configureNativeAppWithRow:row];
+ }
+ } else if ([app isKindOfClass:[ResourceItem class]]) {
+ cell = [self configureDesktopAppWithRow:row];
+ }
+
+ return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 15;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return CGFLOAT_MIN;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSInteger row = indexPath.row;
+ id app = [self.model objectAtIndex:row];
+ if ([app isKindOfClass:[FolderApp class]]) {
+ APP_TYPE type = ((ResourceApp *)app).type;
+ if (type == APP_TYPE_WEBAPP) {
+ WebApp *webApp = (WebApp *)app;
+ NSString *urlString = [webApp.url absoluteString];
+ [self openWebPageInSecBrowserWithURLString:urlString];
+ } else if (type == APP_TYPE_FOLDER) {
+ NSArray *subModel = ((WebApp *)app).children;
+ [self showResourceInSubViewControllerWithModel:subModel];
+ } else if (type == APP_TYPE_NATIVEAPP || type == APP_TYPE_NATIVE_SDK) {
+ NativeApp *nativeApp = (NativeApp *)app;
+ [self openNativeAppWithScheme:nativeApp.scheme];
+ }
+ } else if ([app isKindOfClass:[GCustomItem class]]) {
+ // TODO: open!
+ } else if ([app isKindOfClass:[PubAppItem class]]) {
+ FolderItem *item = [self.model objectAtIndex:row];
+ [self didSelectHostItem:(HostItem *)item atIndexPath:indexPath];
+ }
+}
+
+#pragma mark - DesktopDirect
+- (void)didSelectHostItem:(HostItem *)hostItem atIndexPath:(NSIndexPath *)indexPath {
+ if (self.currentIndex
+ && self.currentIndex.row == indexPath.row
+ && hostItem.status < ResourceStatusReady) {
+ return;
+ }
+
+ self.currentIndex = indexPath;
+ self.currentItem = hostItem;
+
+ ResourceCell *cell = (ResourceCell *)[self.tableView cellForRowAtIndexPath:indexPath];
+
+ __weak typeof(self) weakSelf = self;
+ [self.kvoController observe:hostItem
+ keyPath:@"status"
+ options:NSKeyValueObservingOptionNew
+ block:^(SubResourceViewController *observer, HostItem *host, NSDictionary *change) {
+ NSInteger hostStatus = host.status;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [cell updateUI:host];
+ if (observer.currentIndex.row != indexPath.row) {
+ return;
+ }
+
+ if (observer.silence) {
+ return;
+ }
+ if (host.status == ResourceStatusReady) {
+ [observer.kvoController unobserve:host];
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ AppManager *appManager = [AppManager sharedInstance];
+ BOOL cliEnabledNEC = NO;
+ NSString *enabledNEC = appManager.desktopSettings.settings[@"jp-rdp"];
+ if (enabledNEC && [enabledNEC isEqualToString:@"1"])
+ cliEnabledNEC = YES;
+ if (cliEnabledNEC || [userDefaults integerForKey:@"desktop_client_vendor"] == 1) {
+ [observer openRDClientNEC:host];
+ } else {
+ [observer openRDClient:host];
+ }
+ // Reset power state
+ host.powerState = HostPowerStateDown;
+ return;
+ } else if (hostStatus >= ResourceStatusFailed && hostStatus < ResourceStatusResolveHostNameFailed) {
+ ANError(@"Cannot connect to remote host, error code: %zi", hostStatus);
+
+ if (hostStatus == ResourceStatusPowerDown) {
+ NSString *message = NSLocalizedString(@"It seems the remote host is turned off. Would you like to try and wake it up?", nil);
+
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ HostItem *host = [weakSelf.model objectAtIndex:weakSelf.currentIndex.row];
+ [host wakeUp];
+ }
+ cancelAction:nil];
+
+ [weakSelf presentViewController:dialog animated:YES completion:nil];
+
+ return;
+ } else {
+ [observer.kvoController unobserve:host];
+ }
+ }
+ });
+ }];
+
+ [hostItem prepare];
+}
+
+- (void)openRDClient:(HostItem *)hostItem {
+ NSURL *url = hostItem.url;
+ if (!url) {
+ return;
+ }
+
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil), @"RD Client"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = [NSString stringWithFormat:APPSTORE_SEARCH_STRING,
+ [@"RD Client" stringByAddingPercentEncodingWithAllowedCharacters:
+ NSCharacterSet.URLQueryAllowedCharacterSet]];
+
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openRDClientNEC:(HostItem *)hostItem {
+ NSURL *url = hostItem.urlVendorNEC;
+ if (!url) {
+ return;
+ }
+
+ if (![[UIApplication sharedApplication] canOpenURL:url]) {
+ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Application %@ has not been installed, Would you like to search it on App Store?", nil),@"RD"];
+ PopupDialog *dialog = [ANPopupDialog doubleButtonsPopupDialogWithTitle:NSLocalizedString(@"Cannot connect to remote host", nil)
+ message:message
+ confirmAction:^{
+ NSString *string = @"https://itunes.apple.com/jp/app/rd-v1.3/id771611106?mt=8";
+ OpenURL([NSURL URLWithString:string]);
+ }
+ cancelAction:nil];
+
+ [self presentViewController:dialog animated:YES completion:nil];
+ }
+}
+
+- (void)openWebPageInSecBrowserWithURLString:(NSString *)urlString {
+ ZTWKWebViewController *control = [[ZTWKWebViewController alloc] init];
+ control.webUrl = urlString;
+ [self.navigationController pushViewController:control animated:YES];
+}
+
+- (void)openNativeAppWithScheme:(NSString *)scheme {
+ NSURL *url = [NSURL URLWithString:scheme];
+ if (url.scheme == nil) {
+ url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://", scheme]];
+ }
+
+ OpenURL(url);
+}
+
+- (void)showResourceInSubViewControllerWithModel:(NSArray *)model {
+ UIStoryboard *mainBoard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
+ SubResourceViewController *viewController = [mainBoard instantiateViewControllerWithIdentifier:kSubResourceStoryBoardID];
+ [viewController setModel:model];
+
+ [self.navigationController pushViewController:viewController animated:YES];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SyferLockLoginViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SyferLockLoginViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SyferLockLoginViewController.h (working copy)
@@ -0,0 +1,23 @@
+//
+// SyferLockLoginViewController.h
+// MobileNow
+//
+// Created by wangxy on 16/5/3.
+// Copyright © 2016年 ArrayNetworks. All rights reserved.
+//
+
+#import
+
+#define TOTAL_ITEMS_IN_COLLECTION_VIEW 12
+#define TOTAL_NUMBERS_ON_EACH_MATRIX_ITEM 9
+
+@interface SyferLockLoginViewController : UIViewController
+
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UITextField *passwordTextField;
+@property (weak, nonatomic) IBOutlet UILabel *gridPINLabel;
+@property (weak, nonatomic) IBOutlet UIButton *loginButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *cancelBarButton;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *loginActivity;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SyferLockLoginViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SyferLockLoginViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/SyferLockLoginViewController.m (working copy)
@@ -0,0 +1,157 @@
+//
+// SyferLockLoginViewController.m
+// MobileNow
+//
+// Created by wangxy on 16/5/3.
+// Copyright © 2016年 ArrayNetworks. All rights reserved.
+//
+
+#import "Global.h"
+#import "AAAManager.h"
+#import "SyferLockLoginViewController.h"
+#import "SyferLockLoginCollectionViewCell.h"
+
+#define isPad (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+
+@interface SyferLockLoginViewController ()
+
+@property (strong, nonatomic) UITapGestureRecognizer *tapGesture;
+
+@end
+
+@implementation SyferLockLoginViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ [self setAutomaticallyAdjustsScrollViewInsets:NO];
+ _collectionView.backgroundColor = [UIColor whiteColor];
+ _collectionView.dataSource = self;
+ _collectionView.delegate = self;
+ [SyferLockLoginCollectionViewCell registerCellForCollectionView:self.collectionView];
+ _passwordTextField.delegate = self;
+ [self configLocalizationStrings];
+ [self configLoginButton];
+ [self addTapGestureOnCollectionView];
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)loginButtonTapped:(id)sender {
+ AAAManager *manager = [AAAManager sharedInstance];
+ VPNAccount *syferLockAccount = [[VPNAccount alloc] init];
+ syferLockAccount = [manager.account copy];
+ syferLockAccount.passWord = [_passwordTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ [manager continueVPNThreadWithSyferLockAccount:syferLockAccount];
+
+ [self waitForLoginFinished];
+}
+
+- (IBAction)cancelButtonTapped:(id)sender {
+ [[AAAManager sharedInstance] cancelLoginTapped];
+}
+
+- (NSString *)syferLockSubStringWithIndex:(NSInteger)index {
+ NSString *allSyferLockNumbers = [AAAManager sharedInstance].syferLockInfo;
+ if (allSyferLockNumbers != nil) {
+ NSInteger rangeLength = TOTAL_NUMBERS_ON_EACH_MATRIX_ITEM;
+ return [allSyferLockNumbers substringWithRange:NSMakeRange(index * rangeLength, rangeLength)];
+ }
+ return nil;
+}
+
+- (void)configLocalizationStrings {
+ self.navigationItem.title = NSLocalizedString(@"GridGuard Login", nil);
+ self.cancelBarButton.title = NSLocalizedString(@"Cancel", nil);
+ self.gridPINLabel.text = NSLocalizedString(@"Enter GridPIN", nil);
+ [self.loginButton setTitle:NSLocalizedString(@"Login", nil)
+ forState:UIControlStateNormal];
+}
+
+- (void)configLoginButton {
+ _loginButton.layer.shadowOffset = CGSizeMake(5.0, 5.0);
+ _loginButton.layer.shadowColor = MAIN_COLOR.CGColor;
+ _loginButton.layer.shadowOpacity = 0.25;
+ _loginButton.layer.cornerRadius = 2.5;
+ _loginButton.layer.masksToBounds = YES;
+ [_loginButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+}
+
+- (void)waitForLoginFinished {
+ [self hideLoginButton];
+ [self showActivityIndicator];
+}
+
+- (void)showActivityIndicator {
+ [_loginActivity startAnimating];
+}
+
+- (void)hideLoginButton {
+ [_loginButton setHidden:YES];
+}
+
+- (void)addTapGestureOnCollectionView {
+ if (_tapGesture == nil) {
+ _tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self
+ action:@selector(dismissKeyBoard:)];
+
+ }
+ [self.collectionView addGestureRecognizer:_tapGesture];
+}
+
+- (IBAction)dismissKeyBoard:(UITapGestureRecognizer *)sender
+{
+ [self.passwordTextField resignFirstResponder];
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ if ([_passwordTextField isFirstResponder]) {
+ [_passwordTextField resignFirstResponder];
+ }
+ return YES;
+}
+
+#pragma mark - UICollectionViewDataSource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+ return TOTAL_ITEMS_IN_COLLECTION_VIEW;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+ SyferLockLoginCollectionViewCell *cell = [[self collectionView] dequeueReusableCellWithReuseIdentifier:(NSString *)syferLockLoginReusableIdentifier
+ forIndexPath:indexPath];
+ if (cell != nil) {
+ NSString *numbersOnMatrixItem = [self syferLockSubStringWithIndex:indexPath.item];
+ [cell configureCellWithNumberString:numbersOnMatrixItem];
+ }
+ return cell;
+}
+
+#pragma mark - UICollectionViewDelegateFlowLayout
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
+ return [SyferLockLoginCollectionViewCell syflerLockLoginViewCellSize];
+}
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section {
+ // Add header view height to adjust the top edge to navigation.
+ return CGSizeMake(0, 10);
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section {
+ if (isPad) {
+ return 30;
+ }
+ return 10;
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
+ if (isPad) {
+ return 20;
+ }
+ return 15;
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+Activity.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+Activity.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+Activity.h (working copy)
@@ -0,0 +1,15 @@
+//
+// UIViewController+Activity.h
+// MacTunnel
+//
+// Created by wangxy on 2017/9/12.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface UIViewController (Activity)
+
+- (void)showLoginActivity:(BOOL)aBool;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+Activity.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+Activity.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+Activity.m (working copy)
@@ -0,0 +1,57 @@
+//
+// UIViewController+Activity.m
+// MacTunnel
+//
+// Created by wangxy on 2017/9/12.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+#import "UIViewController+Activity.h"
+
+static NSString * const ActivityDarkControlKey = @"ActivityDarkControlKey";
+static NSString * const ActivityOriginalTitleKey = @"ActivityOriginalTitleKey";
+
+@implementation UIViewController (Activity)
+
+- (void)showLoginActivity:(BOOL)aBool {
+ UIControl *darkControl = objc_getAssociatedObject(self, &ActivityDarkControlKey);
+ if (!darkControl) {
+ darkControl = [[UIControl alloc] initWithFrame:self.view.bounds];
+ darkControl.backgroundColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.5];
+ objc_setAssociatedObject(self, &ActivityDarkControlKey, darkControl, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+
+ if (aBool) {
+ UIActivityIndicatorView *a = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+ [a startAnimating];
+
+ UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 20)];
+ [view addSubview:a];
+
+ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(a.frame.size.width + 5, 0, 70, 20)];
+ label.adjustsFontSizeToFitWidth = YES;
+ label.textColor = [UIColor whiteColor];
+
+ NSString *originalTitle = self.navigationItem.title;
+ objc_setAssociatedObject(self, &ActivityOriginalTitleKey, originalTitle, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ UIFont * font = [UIFont boldSystemFontOfSize:17];
+ label.font = font;
+ label.text = NSLocalizedString(@"Verifying", nil);
+ label.backgroundColor = [UIColor clearColor];
+ [view addSubview:label];
+
+ [self.view endEditing:YES];
+ self.navigationItem.titleView = view;
+ [self.view addSubview:darkControl];
+ } else {
+ self.navigationItem.titleView = nil;
+ NSString *originalTitle = objc_getAssociatedObject(self, &ActivityOriginalTitleKey);
+ if (originalTitle) {
+ self.navigationItem.title = originalTitle;
+ }
+ [darkControl removeFromSuperview];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+HideKeyboard.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+HideKeyboard.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+HideKeyboard.h (working copy)
@@ -0,0 +1,15 @@
+//
+// UIViewController+HideKeyboard.h
+// MacTunnel
+//
+// Created by wangxy on 2017/9/12.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import
+
+@interface UIViewController (HideKeyboard)
+
+- (void)enableHideKeyboard;
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+HideKeyboard.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+HideKeyboard.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/UIViewController+HideKeyboard.m (working copy)
@@ -0,0 +1,24 @@
+//
+// UIViewController+HideKeyboard.m
+// MacTunnel
+//
+// Created by wangxy on 2017/9/12.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#import "UIViewController+HideKeyboard.h"
+
+@implementation UIViewController (HideKeyboard)
+
+// To dismiss keyboard on tapping.
+- (void)enableHideKeyboard {
+ UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hideKeyboard)];
+ gesture.cancelsTouchesInView = NO;
+ [self.view addGestureRecognizer:gesture];
+}
+
+- (void)hideKeyboard {
+ [self.view endEditing:YES];
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWKWebViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWKWebViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWKWebViewController.h (working copy)
@@ -0,0 +1,19 @@
+//
+// ZTWKWebViewController.h
+// iSecSP
+//
+// Created by YJoo on 2022/8/9.
+// Copyright © 2022 Infosec. All rights reserved.
+//
+
+#import
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ZTWKWebViewController : UIViewController
+
+@property (nonatomic, copy) NSString *webUrl;
+
+@end
+
+NS_ASSUME_NONNULL_END
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWKWebViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWKWebViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWKWebViewController.m (working copy)
@@ -0,0 +1,155 @@
+//
+// ZTWKWebViewController.m
+// iSecSP
+//
+// Created by YJoo on 2022/8/9.
+// Copyright © 2022 Infosec. All rights reserved.
+//
+
+#import "ZTWKWebViewController.h"
+#import
+#import "FBKVOController.h"
+#import "Global.h"
+
+@interface ZTWKWebViewController ()
+
+@property (nonatomic, strong) WKWebView *webView;
+@property (nonatomic, strong) UIProgressView *progressView;
+@property (nonatomic, strong) FBKVOController *kvoController;
+
+@end
+
+@implementation ZTWKWebViewController
+
+- (WKWebView *)webView {
+ if (_webView == nil) {
+
+ _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, screenWidth, screenHeight)];
+ _webView.navigationDelegate = self;
+ _webView.UIDelegate = self;
+ }
+ return _webView;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.view.backgroundColor = RGBA(239, 239, 244, 1);
+
+ [self setNavigationItems];
+ [self initWebView];
+ [self initFBKVO];
+}
+
+
+- (void)initWebView
+{
+ [self.view addSubview:self.webView];
+ [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.webUrl]]];
+
+ _progressView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, SafeAreaTopHeight, screenWidth, 2)];
+ _progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
+ _progressView.progressTintColor = [UIColor greenColor];
+ [self.view addSubview:_progressView];
+}
+
+
+- (void)initFBKVO
+{
+ __weak typeof (self) weakSelf = self;
+ self.kvoController = [FBKVOController controllerWithObserver:self];
+ [self.kvoController observe:self.webView keyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew block:^(id _Nullable observer, id _Nonnull object, NSDictionary * _Nonnull change) {
+
+ weakSelf.progressView.alpha = 1;
+ [weakSelf.progressView setProgress:self.webView.estimatedProgress animated:YES];
+ if(weakSelf.webView.estimatedProgress >= 1.0f)
+ {
+ [UIView animateWithDuration:0.5 animations:^{
+ weakSelf.progressView.alpha = 0;
+ } completion:^(BOOL finished) {
+ [weakSelf.progressView setProgress:0.0f animated:NO];
+ }];
+ }
+ }];
+
+ [self.kvoController observe:self.webView keyPath:@"title" options:NSKeyValueObservingOptionNew block:^(id _Nullable observer, id _Nonnull object, NSDictionary * _Nonnull change) {
+ weakSelf.title = self.webView.title;
+ }];
+}
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(nonnull WKNavigationAction *)navigationAction decisionHandler:(nonnull void (^)(WKNavigationActionPolicy))decisionHandler
+{
+ if (navigationAction.targetFrame == nil) {
+ [_webView loadRequest:navigationAction.request];
+ }
+
+ decisionHandler(WKNavigationActionPolicyAllow);
+}
+
+////页面加载完成后
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+ NSLog(@"");
+}
+
+//页面加载失败
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
+{
+ NSLog(@"");
+}
+
+-(void)setNavigationItems
+{
+ UIBarButtonItem *itemBack = [self barButtonItemWithTitle:@"后退" target:self action:@selector(goBackAction)];
+ UIBarButtonItem *itemReFresh = [self barButtonItemWithImage:[UIImage imageNamed:@"SecBrowserReload"] target:self action:@selector(refreshAction)];
+ self.navigationItem.rightBarButtonItems = @[itemBack, itemReFresh];
+}
+
+- (void)goBackAction
+{
+ [_webView goBack];
+}
+
+- (void)refreshAction
+{
+ [_webView reload];
+}
+
+- (UIBarButtonItem *)barButtonItemWithImage:(UIImage *)image target:(id)target action:(SEL)selector {
+
+ UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+
+ [button setBackgroundImage:image forState:UIControlStateNormal];
+ button.tintColor = nil;
+
+ [button addTarget:target action:selector forControlEvents:UIControlEventTouchUpInside];
+
+ button.size = button.currentBackgroundImage.size;
+
+ return [[UIBarButtonItem alloc] initWithCustomView:button];
+}
+
+- (UIBarButtonItem *)barButtonItemWithTitle:(NSString *)title target:(id)target action:(SEL)selector {
+
+ UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+ button.backgroundColor = [UIColor clearColor];
+ [button setTitle:title forState:UIControlStateNormal];
+ [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ button.titleLabel.font = [UIFont systemFontOfSize:14];
+ [button addTarget:target action:selector forControlEvents:UIControlEventTouchUpInside];
+
+ button.size = CGSizeMake(40, 40);
+
+ return [[UIBarButtonItem alloc] initWithCustomView:button];
+}
+
+- (void)pop {
+
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWebAuthViewController.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWebAuthViewController.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWebAuthViewController.h (working copy)
@@ -0,0 +1,21 @@
+//
+// ZTWebAuthViewController.h
+// MotionProPlus
+//
+// Created by YJoo on 2022/6/2.
+// Copyright © 2022 Infosec. All rights reserved.
+//
+
+#import
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ZTWebAuthViewController : UIViewController
+
+typedef void (^AuthCallback)(NSError *error, NSString *session, NSString *username, NSString *acsInfo);
+
+@property (nonatomic, strong) NSDictionary *infoDic;
+
+@end
+
+NS_ASSUME_NONNULL_END
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWebAuthViewController.m
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWebAuthViewController.m (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Controllers/ZTWebAuthViewController.m (working copy)
@@ -0,0 +1,312 @@
+//
+// ZTWebAuthViewController.m
+// MotionProPlus
+//
+// Created by YJoo on 2022/6/2.
+// Copyright © 2022 Infosec. All rights reserved.
+//
+
+#import "ZTWebAuthViewController.h"
+#import
+#import "ANLogger.h"
+#import "Global.h"
+#import "NSURLRequest+ForSSL.h"
+#import "Singleton.h"
+#import "MBProgressHUD.h"
+
+#define MP_WELCOME_LOCALHOST_URL @"/prx/000/http/localhost/welcome"
+#define MP_WELCOME_LOCALH_URL @"/prx/000/http/localh/welcome"
+#define MP_SESSION_PREFIX @"ANsession"
+#define MP_USERNAME_COOKIE @"username"
+#define MP_ACCESS_NAME @"acs_mode"
+#define MP_ACCESS_DESC @"acs_desc"
+#define MP_ROLE_NAMES @"role_names"
+
+@interface ZTWebAuthViewController ()
+{
+ NSString *_urlString;
+}
+
+@property (nonatomic, strong) WKWebView * webView;
+@property (copy, nonatomic) AuthCallback completion;
+@property (nonatomic, strong) NSMutableArray *cookies;
+@property (nonatomic, assign) BOOL isActivePop;
+
+@end
+
+@implementation ZTWebAuthViewController
+
+- (WKWebView *)webView {
+ if (_webView == nil) {
+
+ _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, screenWidth, screenHeight)];
+ _webView.navigationDelegate = self;
+ _webView.UIDelegate = self;
+ }
+ return _webView;
+}
+
+-(void)viewWillDisappear:(BOOL)animated
+{
+ if (self.webView.isLoading) {
+ [self.webView stopLoading];
+ }
+
+ if (_isActivePop){
+
+ [self cancelButtonClicked];
+ }
+
+ [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.title = @"WebAuth";
+
+ self.isActivePop = YES;
+ [self.view addSubview:self.webView];
+ [self startLoadPage];
+}
+
+- (void)cancelButtonClicked
+{
+ if (self.completion) {
+ self.completion(nil, nil, nil, nil);
+ }
+}
+
+- (BOOL)startLoadWithHost:(NSString *)host alias:(NSString *)alias port:(NSString *)port url:(NSString *)url completion:(AuthCallback)completion {
+ if (url.length > 0) {
+ _urlString = url;
+ } else {
+ _urlString = [self setHost:host alias:alias andPort:port];
+ }
+ if (_urlString == nil) {
+ // TODO: Add alert to show error to user.
+ return NO;
+ }
+
+ self.completion = completion;
+
+ return YES;
+}
+
+- (void)startLoadPage {
+ NSURL *url = [NSURL URLWithString:_urlString];
+ NSURLRequest *request = [NSURLRequest requestWithURL:url];
+ [NSURLRequest allowsAnyHTTPSCertificateForHost:url.host];
+
+ [self.webView loadRequest:request];
+ [self showIndicator];
+}
+
+- (NSString *)setHost:(NSString *)host alias:(NSString *)alias andPort:(NSString *)port {
+ NSString *urlString = nil;
+
+ if (!host || host.length == 0) {
+ ANError(@"WebView received invalid host.");
+ return nil;
+ }
+
+ if (port && port.length > 0) {
+ host = [NSString stringWithFormat:@"%@:%@", host, port];
+ }
+
+ if (alias && alias.length > 0) {
+ urlString = [NSString stringWithFormat:@"https://%@/%@", host, alias];
+ return urlString;
+ }
+
+ urlString = [NSString stringWithFormat:@"https://%@", host];
+
+ return urlString;
+}
+
+- (NSString *)retrieveUsernameFromCookieJar
+{
+ for (NSHTTPCookie *cookie in _cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE]) {
+ NSString *username = cookie.value;
+ ANDebug(@"WebAuth username is %@", username);
+ return username;
+ }
+ }
+ }
+
+ return nil;
+}
+
+- (NSString *)retrieveAcsInfoFromCookieJar
+{
+ NSString *oauthAcsInfo, *username, *acsName, *acsDesc, *roleName;
+ for (NSHTTPCookie *cookie in _cookies) {
+ if (cookie.name) {
+ if ([cookie.name isEqualToString:MP_USERNAME_COOKIE]) {
+ username = cookie.value ?: @"";
+ ANInfo(@"WebAuth username is %@", username);
+ continue;
+ } else if ([cookie.name isEqualToString:MP_ACCESS_NAME]) {
+ acsName = cookie.value ?: @"";
+ ANInfo(@"WebAuth acsName is %@", acsName);
+ continue;
+ } else if ([cookie.name isEqualToString:MP_ACCESS_DESC]) {
+ acsDesc = cookie.value ?: @"";
+ ANInfo(@"WebAuth acsDesc is %@", acsDesc);
+ continue;
+ } else if ([cookie.name isEqualToString:MP_ROLE_NAMES]) {
+ roleName = cookie.value ?: @"";
+ ANInfo(@"WebAuth role is %@", roleName);
+ continue;
+ }
+ }
+ }
+
+ oauthAcsInfo = [NSString stringWithFormat:@"username=%@&role_names=%@&acs_mode=%@&acs_desc=%@", username, roleName, acsName, acsDesc];
+ oauthAcsInfo = [oauthAcsInfo stringByReplacingOccurrencesOfString:@"(null)" withString:@""];
+
+ return oauthAcsInfo;
+}
+
+- (NSString *)retrieveSessionFromCookieJar
+{
+ for (NSHTTPCookie *cookie in _cookies) {
+ if (cookie.name) {
+ if ([cookie.name hasPrefix:MP_SESSION_PREFIX]) {
+ NSString *ANSession = [NSString stringWithFormat:@"%@=%@", cookie.name, cookie.value];
+ return ANSession;
+ }
+ }
+ }
+
+ return nil;
+}
+
+-(void) getWebCookies
+{
+ __weak __typeof(self) weakSelf = self;
+ if (@available(iOS 12.0, *)) {
+
+ WKHTTPCookieStore *cookieStore = _webView.configuration.websiteDataStore.httpCookieStore;
+ [cookieStore getAllCookies:^(NSArray * _Nonnull cookiesArray) {
+
+ weakSelf.cookies = cookiesArray.mutableCopy;
+
+ NSString *username = [self retrieveUsernameFromCookieJar];
+ NSString *session = [self retrieveSessionFromCookieJar];
+ NSString *acsInfo = [self retrieveAcsInfoFromCookieJar];
+ [self didFinishedAuthenticationWithError:nil session:session username:username acsInfo:acsInfo];
+ }];
+ }
+}
+
+- (void)showIndicator {
+
+ [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+}
+
+- (void)hideIndicator {
+
+ [MBProgressHUD hideHUDForView:self.view animated:YES];
+}
+
+- (void)didFinishedAuthenticationWithError:(NSError *)error session:(NSString *)session username:(NSString *)username acsInfo:(NSString *)acsInfo {
+ ANInfo(@"WebAuth did finished with error: %@.", error.localizedDescription);
+
+ [self.navigationController popViewControllerAnimated:YES];
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+
+ self.isActivePop = NO;
+ if (self.completion) {
+ self.completion(error, session, username, acsInfo);
+ }
+ });
+}
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(nonnull WKNavigationAction *)navigationAction decisionHandler:(nonnull void (^)(WKNavigationActionPolicy))decisionHandler {
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:navigationAction.request.URL];
+ if ([request.URL.path isEqualToString:MP_WELCOME_LOCALHOST_URL] ||
+ [request.URL.path isEqualToString:MP_WELCOME_LOCALH_URL]) {
+ self.webView.navigationDelegate = self;
+ self.webView.UIDelegate = self;
+
+ [self getWebCookies];
+ decisionHandler(WKNavigationActionPolicyCancel);
+ }else {
+
+ decisionHandler(WKNavigationActionPolicyAllow);
+ }
+}
+
+////页面加载完成后
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
+ [self hideIndicator];
+}
+
+//页面加载失败
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
+ [self hideIndicator];
+ ANError(@"WebAuth received error: %@.", error);
+
+ if ([error.domain isEqualToString:@"NSURLErrorDomain"]) {
+ switch (error.code) {
+ case NSURLErrorServerCertificateUntrusted:
+ // Ignore these errors.
+ return;
+
+ default:
+ break;
+ }
+ }
+
+// [self didFinishedAuthenticationWithError:error session:nil username:nil acsInfo:nil];
+}
+
+- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler {
+ if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
+
+
+ dispatch_async( dispatch_get_global_queue(0, 0), ^{
+ NSURLCredential * card = [[NSURLCredential alloc] initWithTrust:challenge.protectionSpace.serverTrust];
+ completionHandler(NSURLSessionAuthChallengeUseCredential, card);
+ });
+
+
+ }
+}
+
+-(void)setInfoDic:(NSDictionary *)infoDic
+{
+ if (infoDic.count < 1)
+ {
+ return;
+ }
+
+ NSString *host = [infoDic valueForKey:@"host"];
+ NSString *port = [infoDic valueForKey:@"port"];
+ NSString *alias = [infoDic valueForKey:@"alias"];
+ NSString *url = [infoDic valueForKey:@"url"];
+ ANInfo(@"send web auth para, host=%@, port=%@, alias=%@, url=%@", host, port, alias, url);
+ AuthCallback completion = [infoDic valueForKey:@"completion"];
+
+ [self startLoadWithHost:host
+ alias:alias
+ port:port
+ url:url
+ completion:completion];
+}
+
+- (void)pop {
+
+ [self cancelButtonClicked];
+ if (self.navigationController.viewControllers.count > 1) {
+ [self.navigationController popViewControllerAnimated:YES];
+ }else{
+ [self dismissViewControllerAnimated:YES completion:nil];
+ }
+}
+
+
+@end
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h (working copy)
@@ -0,0 +1,60 @@
+//
+// Global.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/17.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#ifndef Global_h
+#define Global_h
+
+#ifdef __OBJC__
+#import
+#endif
+
+// MARK: 这里还是走注释的方式吧，跑对应程序时，注释掉互斥引用，保证100%引用成功
+#if TARGET_OS_IPHONE
+#import
+#import "UIView+frame.h"
+#elif TARGET_OS_MAC
+#import
+#import
+#endif
+
+
+#define UIColorFromRGBA(rgbValue, alphaValue) \
+ [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
+ green:((float)((rgbValue & 0x00FF00) >> 8))/255.0 \
+ blue:((float)(rgbValue & 0x0000FF))/255.0 alpha:alphaValue]
+
+#define MAIN_COLOR UIColorFromRGBA(0xE4701D, 1.0)
+
+#define IS_IOS_10_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] >= 10.0)
+#define IS_IOS_9_2_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] > 9.1)
+
+#define OpenURL(url) [[UIApplication sharedApplication] openURL:(url) options:@{} completionHandler:nil ]
+
+#define APP_URL_SCHEME @"motionproplus"
+
+//保存认证方式
+#define AUTH_METHOD_NAME @"auth_Method_Name"
+#define screenWidth [UIScreen mainScreen].bounds.size.width
+#define screenHeight [UIScreen mainScreen].bounds.size.height
+#define ScaleX screenWidth/375.0f
+#define SCaleY screenHeight/667.0f
+#define SafeAreaTopHeight (screenHeight >= 812.0 ? 88 : 64)
+
+/** 自定义颜色*/
+#define RGBA(r,g,b,a) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a]
+
+#define ISNULLSTR(str) (str == nil || (NSObject *)str == [NSNull null] || str.length == 0 || [str isEqualToString:@"(null)"]||[str isEqualToString:@""])
+
+@protocol ANViewControllerSwitchProtocol
+
+@required
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option;
+
+@end
+
+#endif /* Global_h */
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h.iqiyi
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h.iqiyi (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h.iqiyi (working copy)
@@ -0,0 +1,48 @@
+//
+// Global.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/17.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#ifndef Global_h
+#define Global_h
+
+#import
+#import "UIView+frame.h"
+
+#define UIColorFromRGBA(rgbValue, alphaValue) \
+ [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
+ green:((float)((rgbValue & 0x00FF00) >> 8))/255.0 \
+ blue:((float)(rgbValue & 0x0000FF))/255.0 alpha:alphaValue]
+
+#define MAIN_COLOR UIColorFromRGBA(0x00DC5A, 1.0)
+
+#define IS_IOS_10_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] >= 10.0)
+#define IS_IOS_9_2_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] > 9.1)
+
+#define OpenURL(url) [[UIApplication sharedApplication] openURL:(url)]
+
+#define APP_URL_SCHEME @"motionproplus"
+
+//保存认证方式
+#define AUTH_METHOD_NAME @"auth_Method_Name"
+#define screenWidth [UIScreen mainScreen].bounds.size.width
+#define screenHeight [UIScreen mainScreen].bounds.size.height
+#define ScaleX screenWidth/375.0f
+#define SCaleY screenHeight/667.0f
+
+/** 自定义颜色*/
+#define RGBA(r,g,b,a) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a]
+
+#define ISNULLSTR(str) (str == nil || (NSObject *)str == [NSNull null] || str.length == 0 || [str isEqualToString:@"(null)"]||[str isEqualToString:@""])
+
+@protocol ANViewControllerSwitchProtocol
+
+@required
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option;
+
+@end
+
+#endif /* Global_h */
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h.zrt
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h.zrt (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Global.h.zrt (working copy)
@@ -0,0 +1,48 @@
+//
+// Global.h
+// MacTunnel
+//
+// Created by wangxy on 2017/7/17.
+// Copyright © 2017年 wangxy. All rights reserved.
+//
+
+#ifndef Global_h
+#define Global_h
+
+#import
+#import "UIView+frame.h"
+
+#define UIColorFromRGBA(rgbValue, alphaValue) \
+ [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
+ green:((float)((rgbValue & 0x00FF00) >> 8))/255.0 \
+ blue:((float)(rgbValue & 0x0000FF))/255.0 alpha:alphaValue]
+
+#define MAIN_COLOR UIColorFromRGBA(0xE70012, 1.0)
+
+#define IS_IOS_10_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] >= 10.0)
+#define IS_IOS_9_2_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] > 9.1)
+
+#define OpenURL(url) [[UIApplication sharedApplication] openURL:(url)]
+
+#define APP_URL_SCHEME @"motionproplus"
+
+//保存认证方式
+#define AUTH_METHOD_NAME @"auth_Method_Name"
+#define screenWidth [UIScreen mainScreen].bounds.size.width
+#define screenHeight [UIScreen mainScreen].bounds.size.height
+#define ScaleX screenWidth/375.0f
+#define SCaleY screenHeight/667.0f
+
+/** 自定义颜色*/
+#define RGBA(r,g,b,a) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a]
+
+#define ISNULLSTR(str) (str == nil || (NSObject *)str == [NSNull null] || str.length == 0 || [str isEqualToString:@"(null)"]||[str isEqualToString:@""])
+
+@protocol ANViewControllerSwitchProtocol
+
+@required
+- (void)switchFromSender:(id)sender withOption:(NSDictionary *)option;
+
+@end
+
+#endif /* Global_h */
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist (working copy)
@@ -0,0 +1,33 @@
+
+
+
+
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLIconFile
+ icon
+ CFBundleURLSchemes
+
+ motionproplus
+
+
+
+ ITSAppUsesNonExemptEncryption
+
+ LSApplicationQueriesSchemes
+
+ RD
+ rdp
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIStatusBarHidden~ipad
+
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.InfosecStore
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.InfosecStore (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.InfosecStore (working copy)
@@ -0,0 +1,71 @@
+
+
+
+
+ NSFaceIDUsageDescription
+ MotionPro Plus needs to use your FaceID, which can be configured in Settings
+ CFBundleDevelopmentRegion
+ en
+ CFBundleDisplayName
+ MotionPro
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ $(PRODUCT_NAME)
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 2.3.10
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLIconFile
+ icon
+ CFBundleURLSchemes
+
+ motionproplus
+
+
+
+ CFBundleVersion
+ 3
+ LSApplicationQueriesSchemes
+
+ RD
+ rdp
+
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIMainStoryboardFile
+ Main
+ UIRequiredDeviceCapabilities
+
+ armv7
+
+ UIRequiresFullScreen
+
+ UIStatusBarHidden~ipad
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+
+ UIUserInterfaceStyle
+ Light
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.MotionPro
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.MotionPro (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.MotionPro (working copy)
@@ -0,0 +1,71 @@
+
+
+
+
+ NSFaceIDUsageDescription
+ MotionPro Plus needs to use your FaceID, which can be configured in Settings
+ CFBundleDevelopmentRegion
+ en
+ CFBundleDisplayName
+ MotionPro
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ $(PRODUCT_NAME)
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 2.3.10
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLIconFile
+ icon
+ CFBundleURLSchemes
+
+ motionproplus
+
+
+
+ CFBundleVersion
+ 3
+ LSApplicationQueriesSchemes
+
+ RD
+ rdp
+
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIMainStoryboardFile
+ Main
+ UIRequiredDeviceCapabilities
+
+ armv7
+
+ UIRequiresFullScreen
+
+ UIStatusBarHidden~ipad
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+
+ UIUserInterfaceStyle
+ Light
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.iqiyi
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.iqiyi (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.iqiyi (working copy)
@@ -0,0 +1,71 @@
+
+
+
+
+ NSFaceIDUsageDescription
+ MotionPro Plus needs to use your FaceID, which can be configured in Settings
+ CFBundleDevelopmentRegion
+ en
+ CFBundleDisplayName
+ iQIYI VPN
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ $(PRODUCT_NAME)
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 2.0.20
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLIconFile
+ icon
+ CFBundleURLSchemes
+
+ motionproplus
+
+
+
+ CFBundleVersion
+ 121
+ LSApplicationQueriesSchemes
+
+ RD
+ rdp
+
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIMainStoryboardFile
+ Main
+ UIRequiredDeviceCapabilities
+
+ armv7
+
+ UIRequiresFullScreen
+
+ UIStatusBarHidden~ipad
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+
+ UIUserInterfaceStyle
+ Light
+
+
Index: /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.zrt
===================================================================
--- /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.zrt (nonexistent)
+++ /branches/ag_client_motionProGlobal_ios_new/MotionPro-iOS/Info.plist.zrt (working copy)
@@ -0,0 +1,71 @@
+
+
+
+
+ NSFaceIDUsageDescription
+ MotionPro Plus needs to use your FaceID, which can be configured in Settings
+ CFBundleDevelopmentRegion
+ en
+ CFBundleDisplayName
+ 中融专网
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ $(PRODUCT_NAME)
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 2.0.21
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLIconFile
+ icon
+ CFBundleURLSchemes
+
+ motionproplus
+
+
+
+ CFBundleVersion
+ 122
+ LSApplicationQueriesSchemes
+
+ RD
+ rdp
+
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIMainStoryboardFile
+ Main
+ UIRequiredDeviceCapabilities
+
+ armv7
+
+ UIRequiresFullScreen
+
+ UIStatusBarHidden~ipad
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+
+ UIUserInterfaceStyle
+ Light
+
+