transmission-rss 0.1.0 → 0.1.1

data/README.rdoc

@@ -36,8 +36,9 @@ It should at least contain a list of feeds:
 === All available options
 
 The following configuration file example contains every existing option
-(although +rss_check_interval+, +paused+ and +server+ are default values
-and coult be omitted). The default +log_target+ is STDERR.
+(although +rss_check_interval+, +paused+ and +server+ are default values and
+could be omitted). The default +log_target+ is STDERR. +privileges+ is not
+defined by default, so the script runs as current user/group.
 
  feeds:
    - http://example.com/feed1
@@ -45,7 +46,7 @@ and coult be omitted). The default +log_target+ is STDERR.
 
  update_interval: 600
 
- start_paused: false
+ add_paused: false
 
  server:
    host: localhost
@@ -53,8 +54,13 @@ and coult be omitted). The default +log_target+ is STDERR.
 
  log_target: /var/log/transmissiond-rss.log
 
+ privileges:
+   user: nobody
+   group: nobody
+
 == TODO
 
 * Timeout and error handling in +Aggregator+ and +Client+
-* Drop privileges
 * Option to stop seeding after full download
+* Privileges configurable by GUI
+* Log level

data/bin/transmission-rss

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require( 'getoptlong' )
+require( 'etc' )
 
 $:.unshift( File.join( File.dirname( __FILE__ ), '../lib' ) )
 require( 'transmission-rss' )
@@ -67,12 +68,13 @@ config = TransmissionRSS::Config.instance
 config.load( {
 	'feeds' => [],
 	'update_interval' => 600,
-	'start_paused' => false,
+	'add_paused' => false,
 	'server' => {
 		'host' => 'localhost',
 		'port' => 9091
 	},
-	'log_target' => $stderr
+	'log_target' => $stderr,
+	'privileges' => {}
 } )
 
 # Initialize a log instance, configure it and run the consumer in a subthread.
@@ -89,6 +91,26 @@ rescue Errno::ENOENT
 end
 log.add( config )
 
+# Drop privileges, if section is given in config file.
+if( not config.privileges.empty? )
+	Process::Sys.setgid(
+		Etc.getgrnam( config.privileges.group ).gid
+	)
+
+	Process::Sys.setuid(
+		Etc.getpwnam( config.privileges.user ).uid
+	)
+
+	log.add(
+		'dropped privileges ' +
+		config.privileges.user +
+		':' +
+		config.privileges.group
+	)
+else
+	log.add( 'no privilege dropping' )
+end
+
 # Start GUI if config edit option is given.
 if( editConfig )
 	require( 'transmission-rss/config-editor' )
@@ -119,7 +141,7 @@ aggregator.feeds.concat( config.feeds )
 # Callback for a new item on one of the feeds.
 aggregator.on_new_item do |torrentFile|
 	Thread.start do
-		client.addTorrent( torrentFile, config.start_paused )
+		client.addTorrent( torrentFile, config.add_paused )
 	end
 end
 

data/lib/transmission-rss.rb

@@ -1,7 +1,7 @@
 $:.unshift( File.dirname( __FILE__ ) )
 
 module TransmissionRSS
-	VERSION = '0.1.0'
+	VERSION = '0.1.1'
 end
 
 dir = 'transmission-rss'

data/lib/transmission-rss/aggregator.rb

@@ -45,7 +45,7 @@ class TransmissionRSS::Aggregator
 
 		while( true )
 			feeds.each do |url|
-				@log.add( 'aggregate ' + url )
+#				@log.add( 'aggregate ' + url )
 
 				begin
 					content = open( url ).readlines.join( "\n" )

data/lib/transmission-rss/config-editor/main.glade

@@ -337,7 +337,7 @@ File</property>
                           <widget class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Logging file path</property>
+                            <property name="label" translatable="yes">	Logging file path</property>
                           </widget>
                           <packing>
                             <property name="top_attach">2</property>
@@ -395,6 +395,106 @@ File</property>
                 <property name="type">tab</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment4">
+                <property name="visible">True</property>
+                <property name="top_padding">5</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">5</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">15</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="checkbutton_drop_privileges">
+                        <property name="label" translatable="yes">Drop privileges after startup</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_checkbutton_drop_privileges_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkTable" id="table5">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="row_spacing">15</property>
+                        <child>
+                          <widget class="GtkLabel" id="label15">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">	User</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="entry_drop_privileges_user">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">&#x25CF;</property>
+                            <property name="width_chars">5</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label16">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">	Group</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="entry_drop_privileges_group">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">&#x25CF;</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Privileges</property>
+                <property name="use_underline">True</property>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>
@@ -413,14 +513,4 @@ File</property>
       </widget>
     </child>
   </widget>
-  <widget class="GtkWindow" id="window2">
-    <child>
-      <widget class="GtkLabel" id="label8">
-        <property name="width_request">320</property>
-        <property name="height_request">240</property>
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">devoted to ann</property>
-      </widget>
-    </child>
-  </widget>
 </glade-interface>

data/lib/transmission-rss/config-editor/main.rb

@@ -6,12 +6,13 @@ class TransmissionRSS::ConfigEditor
 	DEFAULT_CONFIG = {
 		'feeds' => [],
 		'update_interval' => 600,
-		'start_paused' => false,
+		'add_paused' => false,
 		'server' => {
 			'host' => 'localhost',
 			'port' => 9091
 		},
-		'log_target' => $stderr
+		'log_target' => $stderr,
+		'privileges' => {}
 	}
 
 	# Loads glade file and initializes dynamic GUI elements.
@@ -51,7 +52,7 @@ class TransmissionRSS::ConfigEditor
 
 		@entry_update_interval.text = @config.update_interval.to_s
 
-		@checkbutton_add_paused.active = @config.start_paused
+		@checkbutton_add_paused.active = @config.add_paused
 
 		@listbox.clear
 		@listbox.add( @config.feeds )
@@ -73,6 +74,33 @@ class TransmissionRSS::ConfigEditor
 
 			@combobox_logtype.active = 1
 		end
+
+		# If privilege section is given in config.
+		if( @config.privileges.empty? )
+			# Deactivate user entry.
+			@label15.sensitive = false
+			@entry_drop_privileges_user.sensitive = false
+
+			# Deactivate group entry.
+			@label16.sensitive = false
+			@entry_drop_privileges_group.sensitive = false
+
+			@checkbutton_drop_privileges.active = false
+		else
+			# Activate user entry.
+			@label15.sensitive = true
+			@entry_drop_privileges_user.sensitive = true
+
+			# Activate group entry.
+			@label16.sensitive = true
+			@entry_drop_privileges_group.sensitive = true
+
+			# Set entry texts accordingly.
+			@entry_drop_privileges_user.text = @config.privileges.user
+			@entry_drop_privileges_group.text = @config.privileges.group
+
+			@checkbutton_drop_privileges.active = true
+		end
 	end
 
 	# Initializes the ListBox widget.
@@ -102,6 +130,32 @@ class TransmissionRSS::ConfigEditor
 		@listbox.remove( @entry_feed_url.text )
 	end
 
+	# Activate or deactivate entry widgets if drop privileges checkbutton is
+	# toggled.
+	def on_checkbutton_drop_privileges_toggled( widget )
+		if( @checkbutton_drop_privileges.active? )
+			# Activate user entry.
+			@label15.sensitive = true
+			@entry_drop_privileges_user.sensitive = true
+
+			# Activate group entry.
+			@label16.sensitive = true
+			@entry_drop_privileges_group.sensitive = true
+		else
+			# Deactivate user entry.
+			@label15.sensitive = false
+			@entry_drop_privileges_user.sensitive = false
+
+			# Deactivate group entry.
+			@label16.sensitive = false
+			@entry_drop_privileges_group.sensitive = false
+
+			# Delete entry texts.
+			@entry_drop_privileges_user.text = ''
+			@entry_drop_privileges_group.text = ''
+		end
+	end
+
 	# Is called when a value in the log type ComboBox is selected.
 	def on_combobox_logtype_changed( widget )
 		# If STDERR is selected.
@@ -110,6 +164,7 @@ class TransmissionRSS::ConfigEditor
 			@label10.sensitive = false
 			@entry_log_filepath.sensitive = false
 
+			# Delete entry text.
 			@entry_log_filepath.text = ''
 		else
 			# Activate the log file path entry.
@@ -218,7 +273,7 @@ class TransmissionRSS::ConfigEditor
 
 		@config.update_interval = @entry_update_interval.text.to_i
 
-		@config.start_paused = @checkbutton_add_paused.active?
+		@config.add_paused = @checkbutton_add_paused.active?
 
 		@config.feeds = @listbox.items
 
@@ -231,6 +286,16 @@ class TransmissionRSS::ConfigEditor
 			@config.log_target = @entry_log_filepath.text
 		end
 
+		# If checkbutton drop privileges is activated.
+		if( @checkbutton_drop_privileges.active? )
+			# Set user and group to entry texts.
+			@config.privileges.user = @entry_drop_privileges_user.text
+			@config.privileges.group = @entry_drop_privileges_group.text
+		else
+			# Delete privilege section from config hash.
+			@config.delete( 'privileges' )
+		end
+
 		# Try writing to file; dialog on permission error.
 		begin
 			File.open( @configFile, 'w' ) do |f|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - henning mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +02:00
+date: 2010-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: []