protonbot 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0814365197098c02754b106236c66abb16240c6
-  data.tar.gz: 3ea53eb5a89ceefc4e9108adc66720e0eccbf5ee
+  metadata.gz: d1a5472e4396a0d08ee191796d6d1472d1757d18
+  data.tar.gz: 26b2087726298e54d1710ebbb742ace335ce4fa3
 SHA512:
-  metadata.gz: 17b89999e3cfa3bbe9d4d281d6f1a0432944caa2802b31d4921fbee398ad55e58a5b7b126efd50928a3ceefc001d7bbcc27c0381f860247034fd587225e4eb0b
-  data.tar.gz: e80b0efde5fda4c0c939c7eb1427ee70b9f7804be89d988b9449b25ab362bae2dec5611e521f146491ee4080940d7d182861211403e646a445bb8ea4e39e19b3
+  metadata.gz: d2c674190a5701edda7c8e96888280a5456fe2cb7009f64b73f3d1224dc1cb4d7ec4b0657af4506e0ca873e94afda5e15b1a7ee564b5564f31fd9b6139a91b6d
+  data.tar.gz: 29ea337d863db7a96ba7aa502703f9c1bd733dc5f248b733ad831a6f7f05eb033e5c5da722ef65fec3cfb28dda3b5d5f68d688b89d273f6d45a4820c2f941f1e

data/CONFIG.md

@@ -20,7 +20,9 @@ Full-fledged config-hash looks like that:
       'autojoin' => ['#protonbot'],
       'ssl' => true, # This is how you can use SSL
       'ssl_crt' => './server2.crt',
-      'ssl_key' => './server2.key'
+      'ssl_key' => './server2.key',
+      'sasl' => true, # This is how you can use SASL authentication. You also MUST provide `pass` variable
+      'sasl_user' => 'your_SASL_username' # For example, name of NickServ account
     }
   }
 }

data/lib/protonbot/core_plugin/hooks/index.rb

@@ -5,3 +5,4 @@ run 'hooks/privmsg'
 run 'hooks/ctcp'
 run 'hooks/joinpart'
 run 'hooks/nick'
+run 'hooks/sasl'

data/lib/protonbot/core_plugin/hooks/raw.rb

@@ -1,7 +1,7 @@
 hook(type: :raw) do |dat|
   if    m = /^PING :(.+)/.match(dat[:raw_data])
     emit(dat.merge(type: :ping, server: m[1]))
-  elsif m = /^:.+ (\d\d\d) .+? (.+)/.match(dat[:raw_data])
+  elsif m = /^:.+? (\d\d\d) .+? (.+)/.match(dat[:raw_data])
     emit(dat.merge(type: :code, code: m[1], extra: m[2]))
   elsif m = /^:(.+?)!(.+?)@(.+?) PRIVMSG (.+?) :(.+)/.match(dat[:raw_data])
     rto =
@@ -28,5 +28,14 @@ hook(type: :raw) do |dat|
     emit(dat.merge(type: :unick, nick: m[1], user: m[2], host: m[3], to: m[4]))
   elsif m = /^:(.+?)!(.+?)@(.+?) KICK (.+?) (.+?) :.*/.match(dat[:raw_data])
     emit(dat.merge(type: :ukick, nick: m[1], user: m[2], host: m[3], channel: m[4], target: m[5]))
+  elsif m = /^:.+? CAP \* ACK :(.+)/.match(dat[:raw_data])
+    caps = m[1].split(' ')
+    caps.each do |c|
+      dat[:"cap_#{c}"] = true
+      dat[:type] = :cap_ack
+      emit(dat)
+    end
+  elsif m = /^AUTHENTICATE +/.match(dat[:raw_data])
+    emit(dat.merge(type: :auth_ok))
   end
 end

data/lib/protonbot/core_plugin/hooks/sasl.rb

@@ -0,0 +1,15 @@
+hook(type: :cap_ack, cap_sasl: true) do |dat|
+  dat[:plug].write_ 'AUTHENTICATE PLAIN'
+end
+
+hook(type: :auth_ok) do |dat|
+  conf = dat[:plug].conf
+  hash = Base64.strict_encode64(conf['sasl_user'] + "\0" + 
+    conf['sasl_user'] + "\0" +
+    conf['pass'])
+  dat[:plug].write_("AUTHENTICATE #{hash}")
+end
+
+hook(type: :code, code: '903') do |dat|
+  dat[:plug].write_('CAP END')
+end

data/lib/protonbot/plug.rb

@@ -34,14 +34,14 @@
 #     and processes messages from server.
 # @!attribute [r] user
 #   @return [String] Plug's username.
-# @!attribute [r] nick
+# @!attribute [rw] nick
 #   @return [String] Plug's nickname.
 # @!attribute [r] rnam
 #   @return [String] Plug's realname.
 class ProtonBot::Plug
   attr_reader :bot, :db, :sock, :rsock, :name, :conf, :rloop, :wloop, :log, :queue, :chans, :users,
-              :event_locks, :user, :nick, :rnam, :is_ssl
-  attr_accessor :running
+              :event_locks, :user, :rnam, :is_ssl
+  attr_accessor :running, :nick, :use_sasl
 
   # @param bot [Bot]
   # @param name [String]
@@ -61,6 +61,11 @@ class ProtonBot::Plug
     @chans       = {}
     @users       = {}
     @event_locks = []
+    if @conf['sasl'] and @conf['sasl_user'] and @conf['pass']
+      @use_sasl = true
+    else
+      @use_sasl = false
+    end
   end
 
   # Connects to server, introduces and starts reader and writer threads.

data/lib/protonbot/plug_io.rb

@@ -46,7 +46,8 @@ class ProtonBot::Plug
 
   # Sends credentials to server (PASS, NICK, USER).
   def introduce
-    write_("PASS #{@conf['pass']}") if @conf['pass']
+    write_("PASS #{@conf['pass']}") if @conf['pass'] and !@use_sasl
+    write_("CAP REQ :sasl") if @use_sasl
     write_("NICK #{@conf['nick']}")
     write_("USER #{@conf['user']} 0 * :#{@conf['rnam']}")
   end

data/lib/protonbot/version.rb

@@ -1,4 +1,4 @@
 module ProtonBot
   # ProtonBot's version
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/protonbot.rb

@@ -2,6 +2,8 @@ require 'English'
 
 require 'date'
 
+require 'base64'
+
 require 'pastel'
 require 'tty'
 require 'irb'

data/protonbot.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.3.0'
+
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.47'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protonbot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nickolay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - lib/protonbot/core_plugin/hooks/ping.rb
 - lib/protonbot/core_plugin/hooks/privmsg.rb
 - lib/protonbot/core_plugin/hooks/raw.rb
+- lib/protonbot/core_plugin/hooks/sasl.rb
 - lib/protonbot/core_plugin/plugin.rb
 - lib/protonbot/event_lock.rb
 - lib/protonbot/hook.rb
@@ -166,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="