Răsfoiți Sursa

update security

alqindiirsyam 2 ani în urmă
părinte
comite
417c9a88ab

+ 19 - 19
appbuilder-ios/NexilisLite/NexilisLite/Source/CoreMessage_TMessageBank.swift

@@ -42,7 +42,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mCode = CoreMessage_TMessageCode.SEND_SIGNIN
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
 //        tmessage.mBodies[CoreMessage_TMessageKey.BUSINESS_ENTITY] = "74"
         return tmessage
     }
@@ -93,7 +93,7 @@ public class CoreMessage_TMessageBank {
         tMessage.mBodies[CoreMessage_TMessageKey.TYPE_REGISTER] = flag
         tMessage.mBodies[CoreMessage_TMessageKey.IMEI] = imei
         tMessage.mBodies[CoreMessage_TMessageKey.IMSI] = imsi
-        tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
+        tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
         return tMessage
     }
     
@@ -114,7 +114,7 @@ public class CoreMessage_TMessageBank {
         tMessage.mBodies[CoreMessage_TMessageKey.TYPE_REGISTER] = flag
         tMessage.mBodies[CoreMessage_TMessageKey.IMEI] = imei
         tMessage.mBodies[CoreMessage_TMessageKey.IMSI] = imsi
-        tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
+        tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
         return tMessage
     }
     
@@ -1080,8 +1080,8 @@ public class CoreMessage_TMessageBank {
         tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PERSON_INFO
         tmessage.mPIN = me
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = oldpassword
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = oldpassword
         return tmessage
     }
     
@@ -1414,10 +1414,10 @@ public class CoreMessage_TMessageBank {
     public static func checkPassword(password: String) -> TMessage {
         let me = UserDefaults.standard.string(forKey: "me")!
         let tmessage = TMessage()
-        tmessage.mCode = CoreMessage_TMessageCode.CHECK_PASSWORD
+        tmessage.mCode = CoreMessage_TMessageCode.CHECK_PSWD
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = me
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
         return tmessage
     }
     
@@ -1462,7 +1462,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = name
         tmessage.mBodies[CoreMessage_TMessageKey.THUMB_ID] = image
         tmessage.mBodies[CoreMessage_TMessageKey.CATEGORY_FLAG] = role
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
         if (role != "1"){
             tmessage.mBodies[CoreMessage_TMessageKey.DATA] = data
         }
@@ -1570,7 +1570,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = name
         tmessage.mBodies[CoreMessage_TMessageKey.THUMB_ID] = image
         tmessage.mBodies[CoreMessage_TMessageKey.CATEGORY_FLAG] = "\(role)"
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
         if(role != 1){
             tmessage.mBodies[CoreMessage_TMessageKey.DATA] = data
         }
@@ -1830,7 +1830,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
         tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
         return tmessage
     }
@@ -1842,7 +1842,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
         tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
         return tmessage
     }
@@ -1854,28 +1854,28 @@ public class CoreMessage_TMessageBank {
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = me
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
         tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
         return tmessage
     }
     
     public static func getChangePasswordAdmin(p_f_pin:String, pwd_en: String, pwd_old: String) -> TMessage {
         let tmessage = TMessage()
-        tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PASSWORD_ADMIN
+        tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PSWD_ADMIN
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = p_f_pin
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = pwd_en
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = pwd_old
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = pwd_en
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = pwd_old
         return tmessage
     }
     
     public static func getChangePasswordInternal(p_f_pin:String, pwd_en: String, pwd_old: String) -> TMessage {
         let tmessage = TMessage()
-        tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PASSWORD_INTERNAL
+        tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PSWD_INTERNAL
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = p_f_pin
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = pwd_en
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = pwd_old
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = pwd_en
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = pwd_old
         return tmessage
     }
     
@@ -2215,7 +2215,7 @@ public class CoreMessage_TMessageBank {
         tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
         tmessage.mPIN = UserDefaults.standard.string(forKey: "me")!
         tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
-        tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
+        tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
         return tmessage
     }
     

+ 3 - 3
appbuilder-ios/NexilisLite/NexilisLite/Source/CoreMessage_TMessageCode.swift

@@ -697,8 +697,8 @@ public class CoreMessage_TMessageCode {
     public static let SIGN_IN_API_INTERNAL = "SIA04";
     public static let TIMEOUT_CONTACT_CENTER = "CC06";
 
-    public static let CHANGE_PASSWORD_ADMIN = "CP01";
-    public static let CHANGE_PASSWORD_INTERNAL = "CP02";
+    public static let CHANGE_PSWD_ADMIN = "CP01";
+    public static let CHANGE_PSWD_INTERNAL = "CP02";
     public static let EMAIL_CONTACT_CENTER = "CC07";
     public static let QUEUING_CONTACT_CENTER = "CC08";
     public static let STATUS_CONTACT_CENTER = "CC09";
@@ -718,7 +718,7 @@ public class CoreMessage_TMessageCode {
     public static let PUSH_SUBSCRIPTION_SIZE = "PS01";
     
     public static let SIGN_UP_API = "SUA01";
-    public static let CHECK_PASSWORD = "CPW";
+    public static let CHECK_PSWD = "CPW";
     
     public static let GET_LIST_DISCUSSION = "GLD";
     public static let GET_DISCUSSION_COMMENT = "GDC";

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/CoreMessage_TMessageKey.swift

@@ -38,8 +38,8 @@ public class CoreMessage_TMessageKey {
     public static let DELIVERY       = "Dv"
     public static let LINK              = "Bk"
     public static let N_MEMBERS      = "Bl"
-    public static let PASSWORD            = "Bm"
-    public static let PASSWORD_OLD      = "Bm0";
+    public static let PSWD            = "Bm"
+    public static let PSWD_OLD      = "Bm0";
     public static let N_DOWNLOADS    = "Bn"
     public static let DEVICE_BRAND   = "Bo"
     public static let DEVICE_MODEL   = "Bp"

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/Extension.swift

@@ -345,7 +345,7 @@ extension NSObject {
 extension URL {
     
     static func palioImage(named: String) -> URL? {
-        return URL(string: "http://202.158.33.26/filepalio/image/\(named)")
+        return URL(string: "https://newuniverse.io/filepalio/image/\(named)")
     }
     
 }

+ 3 - 3
appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -18,13 +18,13 @@ import NotificationBannerSwift
 public class Nexilis: NSObject {
     public static var sAPIKey = ""
     
-    public static var ADDRESS = ADDRESS_RELEASE
+    public static var ADDRESS = ""
     
-    static let ADDRESS_33 = "192.168.0.33"
+//    static let ADDRESS_33 = "192.168.0.33"
     
     // static let ADDRESS_RELEASE = "202.158.33.26" //CBN
 
-    static let ADDRESS_RELEASE = "108.137.84.148" //AWS
+//    static let ADDRESS_RELEASE = "108.137.84.148" //AWS
     
     //    static let PORT = 45328
     //    static let PORT = 65328 // 33

+ 19 - 19
appbuilder-ios/NexilisLite/NexilisLite/Source/Utils.swift

@@ -8,9 +8,9 @@
 
 import Foundation
 import UIKit
-import var CommonCrypto.CC_MD5_DIGEST_LENGTH
-import func CommonCrypto.CC_MD5
-import typealias CommonCrypto.CC_LONG
+//import var CommonCrypto.CC_MD5_DIGEST_LENGTH
+//import func CommonCrypto.CC_MD5
+//import typealias CommonCrypto.CC_LONG
 
 public final class Utils {
     
@@ -61,22 +61,22 @@ public final class Utils {
         return dateFormatter.string(from: todaysDate as Date)
     }
     
-    public static func getMD5(string: String) -> Data {
-        let length = Int(CC_MD5_DIGEST_LENGTH)
-        let messageData = string.data(using:.utf8)!
-        var digestData = Data(count: length)
-        
-        _ = digestData.withUnsafeMutableBytes { digestBytes -> UInt8 in
-            messageData.withUnsafeBytes { messageBytes -> UInt8 in
-                if let messageBytesBaseAddress = messageBytes.baseAddress, let digestBytesBlindMemory = digestBytes.bindMemory(to: UInt8.self).baseAddress {
-                    let messageLength = CC_LONG(messageData.count)
-                    CC_MD5(messageBytesBaseAddress, messageLength, digestBytesBlindMemory)
-                }
-                return 0
-            }
-        }
-        return digestData
-    }
+//    public static func getMD5(string: String) -> Data {
+//        let length = Int(CC_MD5_DIGEST_LENGTH)
+//        let messageData = string.data(using:.utf8)!
+//        var digestData = Data(count: length)
+//
+//        _ = digestData.withUnsafeMutableBytes { digestBytes -> UInt8 in
+//            messageData.withUnsafeBytes { messageBytes -> UInt8 in
+//                if let messageBytesBaseAddress = messageBytes.baseAddress, let digestBytesBlindMemory = digestBytes.bindMemory(to: UInt8.self).baseAddress {
+//                    let messageLength = CC_LONG(messageData.count)
+//                    CC_MD5(messageBytesBaseAddress, messageLength, digestBytesBlindMemory)
+//                }
+//                return 0
+//            }
+//        }
+//        return digestData
+//    }
     
     static let callDurationFormatter: DateComponentsFormatter = {
         let dateFormatter: DateComponentsFormatter

+ 5 - 5
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/CallProviderDelegate.swift

@@ -154,11 +154,11 @@ extension CallProviderDelegate: CXProviderDelegate {
             return
         }
         call.isOnHold = action.isOnHold
-        if call.isOnHold {
-            // pause??
-        } else {
-            // resume??
-        }
+//        if call.isOnHold {
+//            // pause??
+//        } else {
+//            // resume??
+//        }
         action.fulfill()
     }
     

+ 1 - 5
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -3275,11 +3275,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
         messageText.bottomAnchor.constraint(equalTo: containerMessage.bottomAnchor, constant: -15).isActive = true
         messageText.trailingAnchor.constraint(equalTo: containerMessage.trailingAnchor, constant: -15).isActive = true
         
-        if (dataMessages[indexPath.row]["f_pin"] as? String == idMe) {
-            messageText.textColor = .black
-        } else {
-            messageText.textColor = .black
-        }
+        messageText.textColor = .black
         
         var textChat = (dataMessages[indexPath.row]["message_text"])! as? String
         if (dataMessages[indexPath.row]["lock"] != nil && (dataMessages[indexPath.row]["lock"])! as? String == "1") {

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangeNamePassswordViewController.swift

@@ -151,8 +151,8 @@ public class ChangeNamePassswordViewController: UIViewController {
                     let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: idMe)
                     tMessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = first
                     tMessage.mBodies[CoreMessage_TMessageKey.LAST_NAME] = last
-                    tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = md5Hex
-                    tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = ""
+                    tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = md5Hex
+                    tMessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = ""
                     if let resp2 = Nexilis.writeAndWait(message: tMessage){
                         if resp2.isOk() {
                             Database.shared.database?.inTransaction({ fmdb, rollback in

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangePasswordViewController.swift

@@ -86,8 +86,8 @@ class ChangePasswordViewController: UIViewController {
             let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: idMe)
             let md5HexOld = oldPassword
             let md5HexNew = newPassword
-            tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = md5HexNew
-            tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = md5HexOld
+            tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = md5HexNew
+            tMessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = md5HexOld
             if let resp = Nexilis.writeAndWait(message: tMessage){
                 if resp.isOk() {
                     DispatchQueue.main.async {

+ 0 - 6
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/HistoryBroadcastViewController.swift

@@ -77,12 +77,6 @@ class HistoryBroadcastViewController: UIViewController, UITableViewDelegate, UIT
                     self.historyTableView.reloadData()
                 }
             }
-        } else {
-            getChats {
-                DispatchQueue.main.async {
-                    self.historyTableView.reloadData()
-                }
-            }
         }
     }