yalgaar 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd09d3069d064ace5193b955d3940d96d475b6d
-  data.tar.gz: 41f5bc9de06c68925e0248ca14b420c30774a5a7
+  metadata.gz: 10249762f35446b0099f00b7af453815157ba804
+  data.tar.gz: 08a2813bf4290e9af699aa77d7f720d843c83f6a
 SHA512:
-  metadata.gz: 9a0e71afa8cfd9e8836c0c2a62cb60e2e916ded07d10f3944df6b3b844fdb2ca8806756355f9b2e9055c87d431b83a7c1ff35b0dea0f7e417cceba66d4de5004
-  data.tar.gz: 6dbc43a669f04c5c500591ddec0dbf55930ecae3b088b89f9f00a7393996bb6e188eab395a5adb6f62d106c318bdacde4c10fd513e9b30059d9f3f1663e384a9
+  metadata.gz: 60676b29e736a5ab99cb1b249a3f9f8662fab2683b8dfade272525a4b2581f31f57fc29aba9083cd6f0a03a04f44463bb0386e45b20cbf8ee41e25e0c484ed05
+  data.tar.gz: 818fd3fc1583104e530da19569d4ded1d6d0bde6eb6012b1128fc50a577a685e8f014a359b222fc0830776eb0940c587e2b520c96f118f39bfa51cc346dfb01e

data/examples/connect.rb

@@ -25,13 +25,13 @@ yalgaarClient.yalgaarDisconnect($connectionCallback)
 sleep 2
 
 #yalgaarConnect(clientKey,isSecure,AESSecretKey,AESType,$connectionCallback)#
-yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"SystemLevelSolution",1,$connectionCallback)
+yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"SystemSystemSLSS",128,$connectionCallback)
 sleep 2
 yalgaarClient.yalgaarDisconnect($connectionCallback)
 sleep 2
 
 #yalgaarConnect(clientKey,isSecure,UUID,AESSecretKey,AESType,$connectionCallback)#
-yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"123","SystemLevelSolution",1,$connectionCallback)
+yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"123","SystemSystemSLSS",128,$connectionCallback)
 sleep 2
 yalgaarClient.yalgaarDisconnect($connectionCallback)
 ########################################################END####################################################################

data/examples/yalgaarUser.rb

@@ -74,7 +74,9 @@ end
 
 ########################################################User Area for Calling Pub-sub######################################			
 yalgaarClient = Yalgaar.new
-yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"123",$connectionCallback)
+#~ yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"123",$connectionCallback)
+
+yalgaarClient.yalgaarConnect("ck-47046d75cf64402f",1,"12","1234567812345678",128,$connectionCallback)
 yalgaarClient.yalgaarSubcribe("SLS",$subscribeReturnMessageCallback,$presenceMessageCallback,$errorMsgCallback)
 #~ yalgaarClient.yalgaarHistory("@@@@@!!!!test@@!!","100",$HistoryMessageCallback,$errorMsgCallback)
 loop {

data/lib/mqttbridge/YalgaarChannellist.rb

@@ -2,7 +2,7 @@
 #@brief - <methods>
 #
 #Revision Log:
-#     v1.0.1  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
+#     v1.0.2  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
 #Description:
 #YalgaarInitModule contents methods and variables and enum.. 
 #

data/lib/mqttbridge/YalgaarConnect.rb

@@ -2,7 +2,7 @@
 #@brief - <Connect all varialbes and common methods>
 #
 #Revision Log:
-#     v1.0.1  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
+#     v1.0.2  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
 #Description:
 #YalgaarInitModule contents methods and variables and enum.. 
 #
@@ -52,7 +52,7 @@ require_relative 'YalgaarInitModule'
 		#~ puts args.size
 		case args.size
 			when TWOARGV
-				isEncrpt=0
+				@@isEncrpt=0
 				@@clientKey=args[0]
 				@@isSecure=args[1]
 				@@uuid=generateUUID(3)
@@ -92,11 +92,11 @@ require_relative 'YalgaarInitModule'
 			
 				th = Thread.new do |client|
 				@@client.get do |topic,message|
-					messageParsing(topic,message,isEncrpt)
+					messageParsing(topic,message,@@isEncrpt)
 					end
 				end
 			when THREEARGV
-				isEncrpt=0
+				@@isEncrpt=0
 				@@clientKey=args[0]
 				@@isSecure=args[1]
 				@@uuid=args[2]
@@ -141,21 +141,42 @@ require_relative 'YalgaarInitModule'
 				th = Thread.new do |client|
 					@@client.get do |topic,message|
 						#~ puts "#{topic}: #{message}"
-						messageParsing(topic,message,isEncrpt)
+						messageParsing(topic,message,@@isEncrpt)
 						end
 					end
 			when FOURARGV
-				isEncrpt=1
+				@@isEncrpt=1
 				@@clientKey=args[0]
 				@@isSecure=args[1]
 				@@uuid=generateUUID(3)
 				@@aesSecretKey=args[2]
 				if args[3]==YALGAR_AES_128
 					@@aesType='AES-128-ECB'
+					validAESKey = /^[a-zA-Z0-9]{16}$/
+					validAES = validAESKey.match(@@aesSecretKey)
+					if validAES == nil
+						errmesg=showErrCode(YALGAAR_INVALID_AES_KEY_LENGTH)
+						@@lErrorConnectionCallback.call(errmesg)
+						return
+					end
 				elsif args[3]==YALGAR_AES_192
 					@@aesType='AES-192-ECB'
+					validAESKey = /^[a-zA-Z0-9]{24}$/
+					validAES = validAESKey.match(@@aesSecretKey)
+					if validAES == nil
+						errmesg=showErrCode(YALGAAR_INVALID_AES_KEY_LENGTH)
+						@@lErrorConnectionCallback.call(errmesg)
+						return
+					end
 				elsif args[3]==YALGAR_AES_256
 					@@aesType='AES-256-ECB'		
+					validAESKey = /^[a-zA-Z0-9]{32}$/
+					validAES = validAESKey.match(@@aesSecretKey)
+					if validAES == nil
+						errmesg=showErrCode(YALGAAR_INVALID_AES_KEY_LENGTH)
+						@@lErrorConnectionCallback.call(errmesg)
+						return
+					end
 				else
 					errmesg=showErrCode(YALGAAR_INVALID_AES_TYPE)
 					@@lErrorConnectionCallback.call(errmesg)
@@ -196,11 +217,11 @@ require_relative 'YalgaarInitModule'
 
 				th = Thread.new do |client|
 				@@client.get do |topic,message|
-					messageParsing(topic,message,isEncrpt)
+					messageParsing(topic,message,@@isEncrpt)
 					end
 				end
 			when FIVEARGV
-				isEncrpt=1
+				@@isEncrpt=1
 				@@clientKey=args[0]
 				@@isSecure=args[1]
 				@@uuid=args[2]
@@ -210,10 +231,31 @@ require_relative 'YalgaarInitModule'
 				@@aesSecretKey=args[3]
 				if args[4]==YALGAR_AES_128
 					@@aesType='AES-128-ECB'
+					validAESKey = /^[a-zA-Z0-9]{16}$/
+					validAES = validAESKey.match(@@aesSecretKey)
+					if validAES == nil
+						errmesg=showErrCode(YALGAAR_INVALID_AES_KEY_LENGTH)
+						@@lErrorConnectionCallback.call(errmesg)
+						return
+					end
 				elsif args[4]==YALGAR_AES_192
 					@@aesType='AES-192-ECB'
+					validAESKey = /^[a-zA-Z0-9]{24}$/
+					validAES = validAESKey.match(@@aesSecretKey)
+					if validAES == nil
+						errmesg=showErrCode(YALGAAR_INVALID_AES_KEY_LENGTH)
+						@@lErrorConnectionCallback.call(errmesg)
+						return
+					end
 				elsif args[4]==YALGAR_AES_256
 					@@aesType='AES-256-ECB'		
+					validAESKey = /^[a-zA-Z0-9]{32}$/
+					validAES = validAESKey.match(@@aesSecretKey)
+					if validAES == nil
+						errmesg=showErrCode(YALGAAR_INVALID_AES_KEY_LENGTH)
+						@@lErrorConnectionCallback.call(errmesg)
+						return
+					end
 				else
 					errmesg=showErrCode(YALGAAR_INVALID_AES_TYPE)
 					@@lErrorConnectionCallback.call(errmesg)
@@ -254,7 +296,7 @@ require_relative 'YalgaarInitModule'
 				th = Thread.new do |client|
 				@@client.get do |topic,message|
 					#puts "#{topic}: #{message}"
-					messageParsing(topic,message,isEncrpt)
+					messageParsing(topic,message,@@isEncrpt)
 					end
 				end
 			else

data/lib/mqttbridge/YalgaarHistory.rb

@@ -2,7 +2,7 @@
 #@brief - <methods>
 #
 #Revision Log:
-#     v1.0.1  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
+#     v1.0.2  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
 #Description:
 #YalgaarInitModule contents methods and variables and enum.. 
 #

data/lib/mqttbridge/YalgaarInitModule.rb

@@ -3,7 +3,7 @@
 #@brief - <Initialize all varialbes and common methods>
 #
 #Revision Log:
-#     v1.0.1  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
+#     v1.0.2  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
 #Description:
 #YalgaarInitModule contents methods and variables and enum.. 
 #
@@ -76,6 +76,7 @@ require_relative 'mqtt'
 		YALGAAR_150=150,
 		YALGAAR_NO_SERVER_CONNECTION=151,
 		YALGAAR_INVALID_AES_TYPE=152,
+		YALGAAR_INVALID_AES_KEY_LENGTH=153,
 		YALGAAR_MAX=200
 	]
 	#init(message);
@@ -101,7 +102,8 @@ require_relative 'mqtt'
 		@@lHistoryCallback=nil
 		@@lChannelList=nil
 		@@lUserList=nil
-		@@host='192.168.60.6'
+		@@host='api.yalgaar.io'
+		@@isEncrpt=nil
 	end
 end	
 
@@ -235,12 +237,14 @@ end
 			cipher = OpenSSL::Cipher.new(@@aesType)
 			cipher.encrypt()
 			cipher.key = @@aesSecretKey
+			cipher.iv = @@aesSecretKey[0..15]
 			crypt = cipher.update(msg) + cipher.final()
 			crypt_string = (Base64.encode64(crypt))
 			return crypt_string
 			rescue Exception => exc
-				puts ("Message for the encryption log file for message #{msg} = #{exc.message}")
+				puts "Message for the encryption log file for message #{msg} = #{exc.message}"
 		end
+		
 	end
 	
 	#decryption(channel);
@@ -252,6 +256,7 @@ end
 			cipher = OpenSSL::Cipher.new(@@aesType)
 			cipher.decrypt()
 			cipher.key = @@aesSecretKey
+			cipher.iv = @@aesSecretKey[0..15]
 			tempkey = Base64.decode64(msg)
 			crypt = cipher.update(tempkey)
 			crypt << cipher.final()
@@ -324,6 +329,8 @@ end
 				errMessage="No server connection found."
 			when YALGAAR_INVALID_AES_TYPE																							
 				errMessage="Invalid AES Type."
+			when YALGAAR_INVALID_AES_KEY_LENGTH																							
+				errMessage="Invalid AES key length."	
 			else
 				errMessage="Success"
 		end

data/lib/mqttbridge/YalgaarPublish.rb

@@ -2,7 +2,7 @@
 #@brief - <Publish methods>
 #
 #Revision Log:
-#     v1.0.1  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
+#     v1.0.2  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
 #Description:
 #YalgaarInitModule contents methods and variables and enum.. 
 #
@@ -31,7 +31,12 @@
 	def yalgaarPublish(channel,message)
 		if @@isConnected==true
 			 topic=@@clientKey+'/'+channel
-			 @@client.publish(topic, message, retain=false)
+			if @@isEncrpt==1	
+				cyperText=encryption(message)
+				@@client.publish(topic, cyperText, retain=false)	
+			else	
+				@@client.publish(topic, message, retain=false)	
+			end	
 		else
 			return YALGAAR_NO_SERVER_CONNECTION
 		end	 

data/lib/mqttbridge/YalgaarSubscribe.rb

@@ -2,7 +2,7 @@
 #@brief - <Subscribe methods>
 #
 #Revision Log:
-#     v1.0.1  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
+#     v1.0.2  : Aug 4, 2016   INITIAL OF PROGRAMMER - REVISION DETAIL_1        <- THIS IS THE LATEST REVISION	
 #Description:
 #YalgaarInitModule contents methods and variables and enum.. 
 #

data/lib/mqttbridge/version.rb

@@ -1,4 +1,4 @@
 module YALGAAR
   # The version number of the Yalgaar MQTT gem
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: yalgaar
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - yalgaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies: []
-description: Pure Ruby gem that implements the Yalgaar MQTT protocol, a lightweight
-  protocol for publish/subscribe messaging.
+description: yalgaar Ruby SDK for real-time messaging
 email: yalgaar@slscorp.com
 executables: []
 extensions: []
@@ -171,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: Implementation of the Yalgaar MQTT protocol
+summary: Yalgaar Ruby SDK for real-time messaging
 test_files: []