Skip to content

Commit

Permalink
simplified 30_sdwdate_default
Browse files Browse the repository at this point in the history
  • Loading branch information
@troubadoour
troubadoour committed Jul 13, 2015
1 parent 3a91e98 commit b352060
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 144 deletions.
48 changes: 22 additions & 26 deletions etc/sdwdate.d/30_sdwdate_default
View file
Expand Up @@ -266,13 +266,11 @@ SDWDATE_POOL_ONE=(
## "ea433ils4wtprqbv.onion#EcuadorTransparente 2014-June-19 Transparency Activism ea433ils4wtprqbv.onion https://ea433ils4wtprqbv.tor2web.org/ Ecuador"
## "3qnry3qqjvc2u3c4.onion#ManxLeaks 2014-July-07 Transparency Activism 3qnry3qqjvc2u3c4.onion https://3qnry3qqjvc2u3c4.tor2web.org Isle of Man"
SDWDATE_POOL_TWO=(
"
atlas777hhh7mcs7.onion:80#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html
compass6vpxj32p3.onion:80#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html
globe223ezvh6bps.onion:80#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html
bbbbbb6qtmqg65g6.onion:80#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html
pppppptkftqqnfsq.onion:80#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html
"
"atlas777hhh7mcs7.onion#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html"
"compass6vpxj32p3.onion#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html"
"globe223ezvh6bps.onion#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html"
"bbbbbb6qtmqg65g6.onion#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html"
"pppppptkftqqnfsq.onion#Hosted by Thomas White. https://www.whonix.org/pipermail/whonix-devel/2015-February/000297.html"
"w6csjytbrl273che.onion#Ljost[24][25] 2012-September-30 Transparency Activism w6csjytbrl273che.onion https://w6csjytbrl273che.tor2web.org/ Iceland"
"ak2uqfavwgmjrvtu.onion#MagyarLeaks[26] 2013-July-7 Investigative Journalism ak2uqfavwgmjrvtu.onion https://ak2uqfavwgmjrvtu.tor2web.org Hungary"
"yn6ocmvu4ok3k3al.onion#Publeaks [27][28] 2013-September-9 +40 National/Local Media Consortium yn6ocmvu4ok3k3al.onion https://secure.publeaks.nl Netherlands"
Expand Down Expand Up @@ -301,27 +299,25 @@ SDWDATE_POOL_TWO=(
## removed because no http:
## "4cjw6cwpeaeppfqz.onion#xmpp.riseup.net: 4cjw6cwpeaeppfqz.onion (ports 5222, 5269)"
SDWDATE_POOL_THREE=(
"3g2upl4pq6kufc4m.onion:80#https://duck.co/forum/thread/1762/is-the-duckduckgo-hidden-service-legitimate"
"dju2peblv7upfz3q.onion:80#https://guardianproject.info/2014/10/16/reducing-metadata-leakage-from-software-updates/"
"msydqstlz2kzerdg.onion:80#https://ahmia.fi/address/msydqstlz2kzerdg"
"uj3wazyk5u4hnvtk.onion:80#https://thepiratebay.se/blog/238"
"bitmailendavkbec.onion:80#https://bitmessage.org/forum/index.php?topic=1556.0"
"3g2upl4pq6kufc4m.onion#https://duck.co/forum/thread/1762/is-the-duckduckgo-hidden-service-legitimate"
"dju2peblv7upfz3q.onion#https://guardianproject.info/2014/10/16/reducing-metadata-leakage-from-software-updates/"
"msydqstlz2kzerdg.onion#https://ahmia.fi/address/msydqstlz2kzerdg"
"uj3wazyk5u4hnvtk.onion#https://thepiratebay.se/blog/238"
"bitmailendavkbec.onion#https://bitmessage.org/forum/index.php?topic=1556.0"
"wi7qkxyrdpu5cmvr.onion#Austici www.autistici.org/en/stuff/man_anon/tor.html"
"ic6au7wa3f6naxjq.onion#https://lists.gnupg.org/pipermail/gnupg-users/2014-April/049578.html"
"
nzh3fv6jc6jskki3#riseup.net: nzh3fv6jc6jskki3.onion (port 443)
nzh3fv6jc6jskki3.onion#help.riseup.net: nzh3fv6jc6jskki3.onion (port 443)
cwoiopiifrlzcuos.onion#black.riseup.net: cwoiopiifrlzcuos.onion (port 443)
zsolxunfmbfuq7wf.onion#imap.riseup.net: zsolxunfmbfuq7wf.onion (port 993)
yfm6sdhnfbulplsw.onion#labs.riseup.net: yfm6sdhnfbulplsw.onion (port 80, 443)
xpgylzydxykgdqyg.onion#lists.riseup.net: xpgylzydxykgdqyg.onion (port 80, 443)
zsolxunfmbfuq7wf.onion#mail.riseup.net: zsolxunfmbfuq7wf.onion (ports 443, 465, 587)
5jp7xtmox6jyoqd5:443#pad.riseup.net: 5jp7xtmox6jyoqd5.onion (port 443) (note: only works with https://5jp7xtmox6jyoqd5.onion)
zsolxunfmbfuq7wf.onion#pop.riseup.net: zsolxunfmbfuq7wf.onion (port 995)
zsolxunfmbfuq7wf.onion#smtp.riseup.net: zsolxunfmbfuq7wf.onion (ports 465, 587)
j6uhdvbhz74oefxf.onion#user.riseup.net: j6uhdvbhz74oefxf.onion (port 80, 443)
7lvd7fa5yfbdqaii.onion#we.riseup.net: 7lvd7fa5yfbdqaii.onion (port 443)
"
"nzh3fv6jc6jskki3.onion#riseup.net: nzh3fv6jc6jskki3.onion (port 443)
"nzh3fv6jc6jskki3.onion#help.riseup.net: nzh3fv6jc6jskki3.onion (port 443)
"cwoiopiifrlzcuos.onion#black.riseup.net: cwoiopiifrlzcuos.onion (port 443)
"zsolxunfmbfuq7wf.onion#imap.riseup.net: zsolxunfmbfuq7wf.onion (port 993)
"yfm6sdhnfbulplsw.onion#labs.riseup.net: yfm6sdhnfbulplsw.onion (port 80, 443)
"xpgylzydxykgdqyg.onion#lists.riseup.net: xpgylzydxykgdqyg.onion (port 80, 443)
"zsolxunfmbfuq7wf.onion#mail.riseup.net: zsolxunfmbfuq7wf.onion (ports 443, 465, 587)
"5jp7xtmox6jyoqd5.onion#pad.riseup.net: 5jp7xtmox6jyoqd5.onion (port 443) (note: only works with https://5jp7xtmox6jyoqd5.onion)
"zsolxunfmbfuq7wf.onion#pop.riseup.net: zsolxunfmbfuq7wf.onion (port 995)
"zsolxunfmbfuq7wf.onion#smtp.riseup.net: zsolxunfmbfuq7wf.onion (ports 465, 587)
"j6uhdvbhz74oefxf.onion#user.riseup.net: j6uhdvbhz74oefxf.onion (port 80, 443)
"7lvd7fa5yfbdqaii.onion#we.riseup.net: 7lvd7fa5yfbdqaii.onion (port 443)
"timaq4ygg2iegci7.onion#https://github.com/meejah/txtorcon http://txtorcon.readthedocs.org"
"344c6kbnjnljjzlz.onion#VFEmail https://www.vfemail.net"
"fncuwbiisyh6ak3i.onion#https://keybase.io/docs/command_line/tor"
Expand Down
96 changes: 15 additions & 81 deletions usr/lib/python2.7/dist-packages/sdwdate/config.py
View file
@@ -1,6 +1,6 @@
#!/usr/bin/env python

import os
import os, sys
import glob
import time
import re
Expand All @@ -15,15 +15,6 @@ def read_pools():
pool_two = []
pool_three = []

pool_one_single = []
pool_one_multi = []

pool_two_single = []
pool_two_multi = []

pool_three_single = []
pool_three_multi = []

if os.path.exists('/etc/sdwdate.d/'):
files = sorted(glob.glob('/etc/sdwdate.d/*'))

Expand All @@ -34,6 +25,7 @@ def read_pools():
conf_found = True
with open(conf) as c:
for line in c:
line = line.strip()
if line.startswith('SDWDATE_POOL_ONE'):
SDWDATE_POOL_ONE = True

Expand All @@ -46,14 +38,20 @@ def read_pools():
SDWDATE_POOL_TWO = False
SDWDATE_POOL_THREE = True

elif SDWDATE_POOL_ONE and not line.startswith('##'):
pool_one.append(line.strip())
elif SDWDATE_POOL_ONE and line.startswith('"'):
url = re.search(r'"(.*)#', line)
print '%s' % (url.group(1))
pool_one.append(url.group(1))

elif SDWDATE_POOL_TWO and not line.startswith('##'):
pool_two.append(line.strip())
elif SDWDATE_POOL_TWO and line.startswith('"'):
url = re.search(r'"(.*)#', line)
print '%s' % (url.group(1))
pool_two.append(url.group(1))

elif SDWDATE_POOL_THREE and not line.startswith('##'):
pool_three.append(line.strip())
elif SDWDATE_POOL_THREE and line.startswith('"'):
url = re.search(r'"(.*)#', line)
print '%s' % (url.group(1))
pool_three.append(url.group(1))

if not conf_found:
self.set_default()
Expand All @@ -68,71 +66,7 @@ def read_pools():
print('User configuration folder "/etc/cpfpy.d" does not exist.'\
' Running with default configuration.')

for i in range(len(pool_one)):
if multi_line and pool_one[i] == '"':
multi_line = False
elif multi_line:
url = pool_one[i][0:22]
pool_one_multi.append(url)
elif pool_one[i] == '"':
multi_line = True
elif pool_one[i].startswith('"'):
#url = re.search(r'"(.*)#', pool_one[i])
#pool_one_single.append(url.group(1))
url = pool_one[i][1:23]
pool_one_single.append(url)

print 'pool_one_multi'
for i in xrange(len(pool_one_multi)):
print pool_one_multi[i]
print 'pool 1 singles'
for i in range(len(pool_one_single)):
print pool_one_single[i]

for i in range(len(pool_two)):
if multi_line and pool_two[i] == '"':
multi_line = False
elif multi_line:
url = pool_two[i][0:22]
pool_two_multi.append(url)
elif pool_two[i] == '"':
multi_line = True
elif pool_two[i].startswith('"'):
#url = re.search(r'"(.*)#', pool_two[i])
#pool_two_single.append(url.group(1))
url = pool_two[i][1:23]
pool_two_single.append(url)

print 'pool_two_multi'
for i in xrange(len(pool_two_multi)):
print pool_two_multi[i]
print 'pool 2 singles'
for i in range(len(pool_two_single)):
print pool_two_single[i]

for i in range(len(pool_three)):
if multi_line and pool_three[i] == '"':
multi_line = False
elif multi_line:
url = pool_three[i][0:22]
pool_three_multi.append(url)
elif pool_three[i] == '"':
multi_line = True
elif pool_three[i].startswith('"'):
#url = re.search(r'"(.*)#', pool_three[i])
#pool_three_single.append(url.group(1))
url = pool_three[i][1:23]
pool_three_single.append(url)

print 'pool_three_multi'
for i in xrange(len(pool_three_multi)):
print pool_three_multi[i]
print 'pool_three_single'
for i in range(len(pool_three_single)):
print pool_three_single[i]

return (pool_one_single, pool_two_single, pool_three_single,
pool_one_multi, pool_two_multi, pool_three_multi)
return (pool_one, pool_two, pool_three)

if __name__ == "__main__":
read_pools()
44 changes: 7 additions & 37 deletions usr/lib/python2.7/dist-packages/sdwdate/sdwdate.py
View file
Expand Up @@ -9,25 +9,13 @@

class Sdwdate():
def __init__(self):
self.pool_one_single, self.pool_two_single, self.pool_three_single, \
self.pool_one_multi, self.pool_two_multi, self.pool_three_multi = read_pools()

if len(self.pool_one_multi) > 0:
## Increment the range of random.
self.range_pool_one = len(self.pool_one_single) + 1
print len(self.pool_one_multi)
else:
self.range_pool_one = len(self.pool_one_single)

if len(self.pool_two_multi) > 0:
self.range_pool_two = len(self.pool_two_single) + 1
else:
self.range_pool_two = len(self.pool_two_single)

if len(self.pool_three_multi) > 0:
self.range_pool_three = len(self.pool_three_single) + 1
else:
self.range_pool_three = len(self.pool_three_single)
self.pool_one, self.pool_two, self.pool_three = read_pools()

self.range_pool_one = len(self.pool_one)

self.range_pool_two = len(self.pool_two)

self.range_pool_three = len(self.pool_three)

self.number_of_pools = 3

Expand Down Expand Up @@ -82,14 +70,6 @@ def sdwdate_loop(self):
url_index = []
url_index = random.sample(range(self.range_pool_one), 1)
index = url_index[0]
## url_index is zero based.
if index > len(self.pool_one_single) - 1:
## muti-line entry exists in pool, make it current, pick a random member,
self.pool_one = self.pool_one_multi
url_index = random.sample(range(len(self.pool_one_multi)), 1)
else:
## otherwise, use a single member.
self.pool_one = self.pool_one_single

if len(self.already_picked_index_pool_one) == len(self.pool_one):
self.already_picked_index_pool_one = []
Expand All @@ -107,11 +87,6 @@ def sdwdate_loop(self):
url_index = []
url_index = random.sample(range(self.range_pool_two), 1)
index = url_index[0]
if index > len(self.pool_two_single) - 1:
url_index = random.sample(range(len(self.pool_two_multi)), 1)
self.pool_two = self.pool_two_multi
else:
self.pool_two = self.pool_two_single

if len(self.url_random_pool_two) == len(self.pool_two):
self.already_picked_index_pool_two = []
Expand All @@ -129,11 +104,6 @@ def sdwdate_loop(self):
url_index = []
url_index = random.sample(range(self.range_pool_three), 1)
index = url_index[0]
if index > len(self.pool_three_single) - 1:
url_index = random.sample(range(len(self.pool_three_multi)), 1)
self.pool_three = self.pool_three_multi
else:
self.pool_three = self.pool_three_single

if len(self.url_random_pool_three) == len(self.pool_three):
self.already_picked_index_pool_three = []
Expand Down

0 comments on commit b352060

Please sign in to comment.