BotnetV2 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/BotnetV2/Client.rb +7 -2
  3. data/lib/BotnetV2/Master.rb +1 -0
  4. data/lib/BotnetV2/Network.rb +6 -3
  5. data/lib/BotnetV2/Worker.rb +7 -2
  6. data/lib/BotnetV2/version.rb +1 -1
  7. data/test/cert.pem +16 -15
  8. data/test/private.pem +15 -15
  9. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3bae596965acb7b2d310f36ffd6e1136cd331c9f
4
- data.tar.gz: 9443a29aa3d36d0ba1ed1601108668923144798e
3
+ metadata.gz: 1295eba77cd327b452c1a927a1b251fe7c9e793b
4
+ data.tar.gz: 80fc9cb958b3ba6d1a39da5494f3075ebb25ea62
5
5
  SHA512:
6
- metadata.gz: b9e097a909b6584250f0dd50f9758e5cd5208bd30f65a1c1ee51f5fcf97d83e6fed274ead5e1af769e53a0c2ffd81405ae82dcd45ab2f21a874134fe6ae7aca8
7
- data.tar.gz: 33c43d2bd5aef44d34f9be7e822188e9ccf6d0538f81adc96238d3033b26f1ed10ab45035759729f0e4b0af5b0f84ce8e7f39b73acda41dc40437eee909e4e04
6
+ metadata.gz: e9b2f67be24fa2ef7cf81f650608800e4ee8a43170ea008f73fad66e152da706c11daa6429b8595ee332e7bf4c43abd47693fd5776681c294b54fae812d22e0f
7
+ data.tar.gz: bfd1ba2a1f916694fab7ef8552fa3e42896eb23ffb31834ef4ba78878c452f22db77cad0e86296d7fd79befb9ff1e5650dc621df4726efc2ae1ac5939716d999
data/lib/BotnetV2/Client.rb CHANGED
@@ -60,8 +60,13 @@ module BotnetV2
60
60
  end
61
61
 
62
62
  def exit!
63
- @connection.close
64
- @t.kill
63
+ begin
64
+ @connection.close
65
+ rescue => e
66
+ # nothing
67
+ ensure
68
+ @t.kill
69
+ end
65
70
  message = Hash.new
66
71
  message['client_onDisconnect'] = @onReady['client_onReady']
67
72
  @connection.send message
data/lib/BotnetV2/Master.rb CHANGED
@@ -53,6 +53,7 @@ module BotnetV2
53
53
  end
54
54
 
55
55
  def on_message (message, connection)
56
+ return unless message
56
57
  @verified_clients[connection] = true if message['verify'] == @password
57
58
  return unless @verified_clients[connection]
58
59
  @ready_workers << connection if message['worker_onReady'] != nil
data/lib/BotnetV2/Network.rb CHANGED
@@ -32,7 +32,7 @@ class BotConnection
32
32
  end
33
33
 
34
34
  def close
35
- @network.disconnect @socket unless closed?
35
+ @network.close @socket unless closed?
36
36
  end
37
37
 
38
38
  def closed?
@@ -113,10 +113,13 @@ class BotNetwork
113
113
  end
114
114
 
115
115
  def read(socket = @socket)
116
- JSON.parse(socket.gets.chomp)
116
+ res = socket.gets
117
+ res = res.chomp if res
118
+ res = JSON.parse(res) if res
119
+ res
117
120
  end
118
121
 
119
- def disconnect(socket = @socket)
122
+ def close(socket = @socket)
120
123
  socket.close unless socket.closed?
121
124
  end
122
125
  end
data/lib/BotnetV2/Worker.rb CHANGED
@@ -49,8 +49,13 @@ module BotnetV2
49
49
 
50
50
  def exit!
51
51
  @exit = true
52
- @connection.close
53
- @t.kill
52
+ begin
53
+ @connection.close
54
+ rescue => e
55
+ # nothing
56
+ ensure
57
+ @t.kill
58
+ end
54
59
  end
55
60
  end
56
61
  end
data/lib/BotnetV2/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BotnetV2
2
- VERSION = '1.1.2'
2
+ VERSION = '1.1.3'
3
3
  end
data/test/cert.pem CHANGED
@@ -1,15 +1,16 @@
1
- -----BEGIN CERTIFICATE-----
2
- MIICRzCCAbCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJERTEN
3
- MAsGA1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTESMBAGA1UEAwwJYm90bmV0X3Yy
4
- MB4XDTE0MTAxMTEyNDgyNFoXDTE1MTAxMTEyNDgyNFowPzELMAkGA1UEBhMCREUx
5
- DTALBgNVBAoMBG5vbmUxDTALBgNVBAsMBG5vbmUxEjAQBgNVBAMMCWJvdG5ldF92
6
- MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnZYFMd/sE6bRiuGNYj3VO+ap
7
- vzt0K/WjUmvMdRN+BgJqnSMbtuwlsTsUpjbJY/MA8iue/KJWa6TUf1Vcv6qRfSPa
8
- QJhVdmPqhfSDfy3WEnzNi/LtI7JlbZlc1U5FLXh9VeQXQfbpDXvx/m/sX8oCFAry
9
- QXV7o8SJ3D1EWR/n25ECAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
10
- FgQUHw+bIIPzvZU0nHa80yN2X0BpvB4wHwYDVR0jBBgwFgQUHw+bIIPzvZU0nHa8
11
- 0yN2X0BpvB4wDQYJKoZIhvcNAQEFBQADgYEAAEYEp7CC6fdZiIxAHIqpl8CMrHbH
12
- Ok6XCmT3ypwmupDiLlursUy0+tEH1vEkATcNBAca4yiCzLnOF2zitxeIB+sfE39o
13
- wIg3dzngKEOT9pYI2U+Hej8zaPiToi2kwnJXnMbOvywMKioj3WMtHH1BhCeKHNg4
14
- C3aBFNDAaPh/LhY=
15
- -----END CERTIFICATE-----
1
+ -----BEGIN CERTIFICATE-----
2
+ MIICkTCCAfqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJERTEN
3
+ MAsGA1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTESMBAGA1UEAwwJYm90bmV0X3Yy
4
+ MB4XDTE0MTAxMjIwMTczNloXDTE1MTAxMjIwMTczNlowPzELMAkGA1UEBhMCREUx
5
+ DTALBgNVBAoMBG5vbmUxDTALBgNVBAsMBG5vbmUxEjAQBgNVBAMMCWJvdG5ldF92
6
+ MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv6asYCArXq/8cNTGYWX6nwmx
7
+ wDC3Brva07Of/iIAFzdCL9b0BXCx/13YfD7ChwImvISYyByd5y59vFNiT4C852+g
8
+ H+sl6kqp68JPBOcsWGm1gD7ipfzinY18jd78GS5dr/ftw/LctciaSOnN/ym2s94Z
9
+ a1vW+WtI7pDRmj0ZKjcCAwEAAaOBnDCBmTAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
10
+ DgQWBBQOIdKzdnalrREq3u1qtyownXZo6TBnBgNVHSMEYDBegBQOIdKzdnalrREq
11
+ 3u1qtyownXZo6aFDpEEwPzELMAkGA1UEBhMCREUxDTALBgNVBAoMBG5vbmUxDTAL
12
+ BgNVBAsMBG5vbmUxEjAQBgNVBAMMCWJvdG5ldF92MoIBADANBgkqhkiG9w0BAQUF
13
+ AAOBgQByn+FFiaAJmxxDjW+z4vP3xA+s25moYaDbyMv0XHlKaXhTFtanKqGzVesw
14
+ e6BQm9OsiASeARypmrtD6qyNAvgyNN28eMPIjQLNEgEuZU4aK+rSaKYgDBSO0ueJ
15
+ WlNwLkLxfArnylKI/hOAhOjx6PZxgrsPPF7fR3pKWnJYNUQRwg==
16
+ -----END CERTIFICATE-----
data/test/private.pem CHANGED
@@ -1,15 +1,15 @@
1
- -----BEGIN RSA PRIVATE KEY-----
2
- MIICWwIBAAKBgQCdlgUx3+wTptGK4Y1iPdU75qm/O3Qr9aNSa8x1E34GAmqdIxu2
3
- 7CWxOxSmNslj8wDyK578olZrpNR/VVy/qpF9I9pAmFV2Y+qF9IN/LdYSfM2L8u0j
4
- smVtmVzVTkUteH1V5BdB9ukNe/H+b+xfygIUCvJBdXujxIncPURZH+fbkQIDAQAB
5
- AoGARReHg4yH9z3G1bt6v74YhcDmX9/zWWrDhtmYtSQstvnMQMUp25PCGuiqbw3K
6
- UrYyjfsuI9oRRfTo7kNA/RAN5Tlxmba06SlghuRTitg27pFXVISsxOmEwzQX74Mv
7
- VnccPhTUOUm8sYHNvnOOM+174Al+OkXOtdeyaipdEmMfFCECQQD72OcsT0rPWlET
8
- YEapFX95Bgp8gQtpx8ndO7IdQv5FeeK9AsAeSMBif5lc7gLF4hwSRlsxgU30UMdB
9
- HTxjmhX1AkEAoC84z6kEBTuww8A1y2MgYpxiy/U7BwKzSGxMxSUYGjQjMOU7v4UZ
10
- UGf3+iF9CfickUkY7G0gNhuFqbZ97zLRrQJAf7B9pQ2e1HrqWHSb3uazdt0FPBMB
11
- gmR1iOHXcNairP8bYtGeLrycLlSboW5boZD+wpVBb1wr9g9utyjnkWhycQJAQ//n
12
- 4RfB0irlviOhcobRH6t9sVGYTkCSNSNsb6Bwm+cYLVCSzZnGBkEsnu2KdCoq5O4f
13
- +3XT38RNOJ901I9BPQJAav1Q/Ny334gSk7VcCJIplYMJNkWcv/IbLdDoaX5KdnKG
14
- 7vED5oI5nvRB9DDJd9dwTvvm/KVrVJGINY35wvOjdA==
15
- -----END RSA PRIVATE KEY-----
1
+ -----BEGIN RSA PRIVATE KEY-----
2
+ MIICWwIBAAKBgQC/pqxgICter/xw1MZhZfqfCbHAMLcGu9rTs5/+IgAXN0Iv1vQF
3
+ cLH/Xdh8PsKHAia8hJjIHJ3nLn28U2JPgLznb6Af6yXqSqnrwk8E5yxYabWAPuKl
4
+ /OKdjXyN3vwZLl2v9+3D8ty1yJpI6c3/Kbaz3hlrW9b5a0jukNGaPRkqNwIDAQAB
5
+ AoGAeMS9Bu3+pnJbr3ZFdIbgwWtIeYW5MCMcqB8fCPO//uExchgQOYVkhTlL/C9I
6
+ Qe9XHaCo7iEqV83yKcSZxOOpJU1kH3cMOjVbFL8afY17aB9KblNV+Wtj9m0fIiju
7
+ V9JW953JtKsi6e3FFTj/mVEZRwjUk5/hr4ChDUqIiLZFoKECQQD20JbYaoPsyzjN
8
+ ZaPPYMgNlQdM/RaHcqXqiqBL53hQB1Fe8MwHkyv0tcNVXqXEpQssWf3r56iSAsLl
9
+ AzoTLqmPAkEAxsiJr5CVNS9h8vH0VAE8aSdEzTj0eqXysgxTwYTsCzyoL4ZxkowR
10
+ +ZZ43yaY+m7G+AUy6tM2zJmoO7tpbqWQ2QJALCJahvJtCr/ANYJSS3fr7fnTJ2Iu
11
+ UCQhJRKK3WfTrMPSOh7m7QfVGVoTRsW48LPujoy9Ch0PmKRjw13TWbDDYwJANYXd
12
+ fMYjRrTBXNbFALFsgKuwHMnPGg8Ar+wdySdvHv9wEYvTnK/WTyuy0/Likdut+y37
13
+ Lbs9MA3XfG3Tz5UI0QJAVP8jE6eumPcP8Hj7Fuie3vdjCfe3VeGhlCnSRj55R4HZ
14
+ AuDc6Zp/jdT/ZD9PG4QASBqcND3NPZze1+g9/5Z3yA==
15
+ -----END RSA PRIVATE KEY-----
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: BotnetV2
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Penguinmenac3