rbmk 0.1.0.d → 0.1.0.e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4110b7240f29397f17634e175d64974cdd2738d
-  data.tar.gz: 5f3c5aa09b7fe10d7f0da8dc75110deb341dff00
+  metadata.gz: b34d42c2d4d978cd76745a1b0b6bc5184ea5aa9f
+  data.tar.gz: a738a1fd9e9cd2169aff876c7f4f311ef6c8144f
 SHA512:
-  metadata.gz: ebf931c83e0eaf760d92835b8f4b92954081ba70ae85d39a900307a0f81012e0cca692f435eaf9936b3de73489aa08870fe5048526cef76a145afdb895693693
-  data.tar.gz: d51ff4ca6818bb25178ec927b7ea01d471a0074e5ba967378a6c4695767cef7f4bbeafdd83a45b18620edacd20ba0afdb93fa27eaa3ba35624d2aecaf61d98b1
+  metadata.gz: 58b9db953f0e4205beb825a9f48a9898b19282dad5352d9db46d51e89cfc0a08aa73b9932708dbe43ec244c1979f5805908aa1d9f285b0b1956a7f6b20971ae8
+  data.tar.gz: f55b7e5c2c8211bb984846a7234ae78b4891c8888cfdf0c9be5688b8ff6ad71233e34dcf2ca0fb22ce1072cabf3039c0599b2075e6bdc2097fa6f95081cb5b4b

data/lib/rbmk/operation.rb

@@ -147,6 +147,7 @@ class Operation < LDAP::Server::Operation
 	# --------------------------------------------------------------------------
 	# Okay, now the actual code
 	#
+	attr_reader :server, :orig, :transformed
 	def initialize conn, mid
 		super conn, mid
 		@orig = {}
@@ -155,7 +156,7 @@ class Operation < LDAP::Server::Operation
 
 	def simple_bind version, dn, password
 		orig = {version: version, dn: dn, password: password}
-		opts = transformed __method__ => orig.clone
+		opts = transformed __method__, orig.clone
 		$log.info sprintf('Bind version: %s, dn: %s',
 			log_chunk(orig, opts, '%i', :version),
 			log_chunk(orig, opts, '%p', :dn)
@@ -168,7 +169,7 @@ class Operation < LDAP::Server::Operation
 
 	def search base, scope, deref, filter
 		orig = {filter_array: filter, base: base, scope: scope, deref: deref, attrs: @attributes, vals: (not @typesOnly), limit: (@sizelimit.to_i rescue 0)}
-		opts = transformed __method__ => orig.clone
+		opts = transformed __method__, orig.clone
 		orig[:filter_string] = LDAP::Server::Filter.to_rfc orig[:filter_array]
 		opts[:filter_string] = LDAP::Server::Filter.to_rfc opts[:filter_array]
 		$log.info sprintf('Search %s from %s, scope: %s, deref: %s, attrs: %s, vals: %s, limit: %s',
@@ -181,7 +182,7 @@ class Operation < LDAP::Server::Operation
 			log_chunk(orig, opts, '%i', :limit),
 		)
 		entries = @server.ldap.search_ext2(*opts.values_at(:base, :scope, :filter_string, :attrs), (not opts[:vals]), nil, nil, 0, 0, opts[:limit])
-		transformed(entries: entries).each { |entry| send_SearchResultEntry entry.delete('dn').first, entry }
+		transformed(:entries, entries).each { |entry| send_SearchResultEntry entry.delete('dn').first, entry }
 	rescue LDAP::ResultError
 		@server.handle_ldap_error
 	end
@@ -202,13 +203,9 @@ protected
 		raise $!
 	end
 
-	def transformed spec
-		raise ArgumentError.new('Please provide a hash with exactly one key.') unless (spec.is_a? Hash) and (1 == spec.count)
-		spec.each do |type, object|
-			@orig[type] = object
-			transformed = RBMK::Transform.send type, object
-			return @transformed[type] = transformed
-		end
+	def transformed type, object
+		@orig[type] = object
+		@transformed[type] = RBMK::Transform.send type, object, self
 	rescue
 		$!.log
 		object

data/lib/rbmk/server.rb

@@ -5,8 +5,6 @@ class Server
 
 	%w( CHLD INT HUP QUIT TERM ).each { |sig| const_set ('SIG%s' % sig).to_sym, Signal.list[sig] }
 
-	class Reaped < StandardError; end
-
 	def initialize
 		$master = true
 		@arvg0 = File.basename Process.argv0
@@ -56,7 +54,7 @@ protected
 			act_as_a_child_for peer
 		end
 	rescue SignalException
-		$log.debug 'Trapped %p' % $!.signm
+		$log.debug 'Trapped %p' % ($!.signm.empty? ? 'SIGINT' : $!.signm)
 		case $!.signo
 			when SIGCHLD then reap
 			when SIGINT, SIGHUP, SIGTERM then exit
@@ -74,7 +72,7 @@ protected
 		$0 = sprintf '%s worker for %s', @arvg0, peer
 		Timeout.timeout(self.class.worker_timeout) { serve peer } # FIXME shall move to master in the future or maybe drop altogether in favour of activity detection
 	rescue SignalException
-		$log.debug 'Trapped %p' % $!.signm
+		$log.debug 'Trapped %p' % ($!.signm.empty? ? 'SIGINT' : $!.signm)
 		raise $!
 	rescue Exception
 		$!.log

data/lib/rbmk/transform.rb

@@ -6,7 +6,7 @@ module Transform
 	# :version              LDAP protocol version; should probably be 3
 	# :dn                   Bind DN; like a "username"
 	# :password             Cleartext! Verrrry sensitive!
-	def self.simple_bind opts
+	def self.simple_bind opts, op
 		opts
 	end
 
@@ -19,13 +19,13 @@ module Transform
 	# :attrs                Attributes to be included in resulting objects
 	# :vals                 Whether to include values at all
 	# :limit                Search will not return more than this amount of objects
-	def self.search opts
+	def self.search opts, op
 		opts
 	end
 
 	# Patch this method to transform outbound found entries.
 	# Expect an array of hashes, each of which MUST have a 'dn' key
-	def self.found entries
+	def self.found entries, op
 		entries
 	end
 

data/lib/rbmk/upstream.rb

@@ -13,10 +13,29 @@ class Upstream
 		configContext:        {s: 12, oid: '1.3.6.1.4.1.4203.1.12.2.1', f: 'sua'},
 	}
 
+	def self.search ldap, opts
+		args = [
+			opts.fetch(:base,        ''),
+			opts.fetch(:scope,       LDAP::LDAP_SCOPE_SUBTREE),
+			opts.fetch(:filter,      '(objectClass=*)'),
+			opts.fetch(:attrs,       ['*', '+']),
+			(not opts.fetch(:vals,   true)),
+			opts.fetch(:serverctrls, nil),
+			opts.fetch(:clientctrls, nil),
+			opts.fetch(:sec,         0),
+			opts.fetch(:usec,        0),
+			opts.fetch(:s_attr,      0),
+			opts.fetch(:s_proc,      ''),
+		]
+		res = ldap.search_ext2 *args
+		res.each { |e| yield e } if block_given?
+		res
+	end
+
 	attr_reader :ldap, :root_dse, :schema
 	def initialize
 		@schema = LDAP::Server::Schema.new
-		SPECIAL_ATS.each { |name,at| @schema.add_attrtype format(name, at) }
+		SPECIAL_ATS.each { |name, at| @schema.add_attrtype format(name, at) }
 		ldap = LDAP::Conn.new self.class.host, self.class.port
 		ldap.set_option LDAP::LDAP_OPT_PROTOCOL_VERSION, 3
 		ldap.bind do |ldap|
@@ -25,6 +44,7 @@ class Upstream
 			{add_attrtype: 'attributeTypes', add_objectclass: 'objectClasses'}.each { |meth,id| ssse[id].each { |str| @schema.send meth, str unless str.start_with? FILTER_PREFIX } }
 		end
 		@schema.resolve_oids
+		user_init
 	end
 
 	def bind version, dn, password
@@ -68,5 +88,8 @@ protected
 		saved.close
 	end
 
+	# Patch this method to do something useful right after initialization
+	def user_init; end
+
 end
 end

data/lib/rbmk/version.rb

@@ -1,4 +1,4 @@
 module RBMK
-	VERSION = '0.1.0.d'
-	CODENAME = 'not listening'
+	VERSION = '0.1.0.e'
+	CODENAME = 'never again'
 end

data/lib/rbmk/worker.rb

@@ -1,6 +1,5 @@
 require 'ldap/server'
 require 'rbmk/operation'
-require 'rbmk/peer'
 module RBMK
 class Worker
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbmk
 version: !ruby/object:Gem::Version
-  version: 0.1.0.d
+  version: 0.1.0.e
 platform: ruby
 authors:
 - stronny red
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldap