From b08fe09e296524daf4de7ed16e0bed224f5008a2 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 7 Dec 2015 09:50:26 +0000 Subject: tracklist: support limiting maximum tracklist size This defaults to 16384? This is what mpd uses by default as well. Of course folks interacting with dtas-player directly can override this: dtas-tl max INTEGER dtas-tl max This is NOT meant to be a hard security measure for local users talking to dtas-player directly. It is only to prevent accidentally stupid things like flooding the playlist with a broken script and to prevent remote users from DoS-ing us via the to-be-written mpd proxy/emulation layer. Remember: dtas-player itself will ALWAYS remain capable of executing arbitrary code :) --- lib/dtas/tracklist.rb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'lib/dtas/tracklist.rb') diff --git a/lib/dtas/tracklist.rb b/lib/dtas/tracklist.rb index f3dca31..d3db4e9 100644 --- a/lib/dtas/tracklist.rb +++ b/lib/dtas/tracklist.rb @@ -10,20 +10,27 @@ class DTAS::Tracklist # :nodoc: include DTAS::Serialize attr_accessor :repeat # true, false, 1 attr_reader :shuffle # false or shuffled @list + attr_accessor :max # integer - SIVS = %w(list pos repeat) TL_DEFAULTS = { - "list" => [], - "pos" => -1, - "repeat" => false, + 'list' => [], + 'pos' => -1, + 'repeat' => false, + 'max' => 20_000, } + SIVS = TL_DEFAULTS.keys def self.load(hash) obj = new obj.instance_eval do - list = hash["list"] and @list.replace(list.map { |s| new_track(s) }) - @pos = hash["pos"] || -1 - @repeat = hash["repeat"] || false + list = hash['list'] and @list.replace(list.map { |s| new_track(s) }) + %w(pos repeat max).each do |k| + instance_variable_set("@#{k}", hash[k] || TL_DEFAULTS[k]) + end + + # n.b.: we don't check @list.size against max here in case people + # are migrating + if hash['shuffle'] @shuffle = @list.shuffle @pos = _idx_of(@shuffle, @list[@pos].track_id) if @pos >= 0 @@ -121,6 +128,8 @@ class DTAS::Tracklist # :nodoc: end def add_track(track, after_track_id = nil, set_as_current = false) + return false if @list.size >= @max + track = new_track(track) if after_track_id idx = _idx_of(@list, after_track_id) or -- cgit v1.2.3-24-ge0c7