indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Snake case

merge-requests/30/head
Bob Mottram 2021-12-25 18:54:50 +00:00
parent c63e319bb9
commit a8a4aa3d98
20 changed files with 239 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content.py
View File

@ -171,7 +171,7 @@ def htmlReplaceQuoteMarks(content: str) -> str:
return newContent return newContent
def dangerousCSS(filename: str, allowLocalNetworkAccess: bool) -> bool: def dangerousCSS(filename: str, allow_local_network_access: bool) -> bool:
"""Returns true is the css file contains code which """Returns true is the css file contains code which
can create security problems can create security problems
""" """
@ -209,7 +209,7 @@ def dangerousCSS(filename: str, allowLocalNetworkAccess: bool) -> bool:
# an attacker can include html inside of the css # an attacker can include html inside of the css
# file as a comment and this may then be run from the html # file as a comment and this may then be run from the html
if dangerousMarkup(content, allowLocalNetworkAccess): if dangerousMarkup(content, allow_local_network_access):
return True return True
return False return False

145
daemon.py
View File

@ -1296,7 +1296,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
city, self.server.systemLanguage, city, self.server.systemLanguage,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
self.server.sharedItemFederationTokens, self.server.sharedItemFederationTokens,
@ -1446,7 +1446,7 @@ class PubServer(BaseHTTPRequestHandler):
return 3 return 3
# sent by an actor on a local network address? # sent by an actor on a local network address?
if not self.server.allowLocalNetworkAccess: if not self.server.allow_local_network_access:
localNetworkPatternList = getLocalNetworkAddresses() localNetworkPatternList = getLocalNetworkAddresses()
for localNetworkPattern in localNetworkPatternList: for localNetworkPattern in localNetworkPatternList:
if localNetworkPattern in messageJson['actor']: if localNetworkPattern in messageJson['actor']:
@ -2131,7 +2131,7 @@ class PubServer(BaseHTTPRequestHandler):
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
debug: bool, accessKeys: {}, debug: bool, accessKeys: {},
defaultTimeline: str, themeName: str, defaultTimeline: str, themeName: str,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
systemLanguage: str) -> None: systemLanguage: str) -> None:
"""Receive POST from webapp_themeDesigner """Receive POST from webapp_themeDesigner
""" """
@ -2168,10 +2168,10 @@ class PubServer(BaseHTTPRequestHandler):
'submitThemeDesigner=' not in themeParams: 'submitThemeDesigner=' not in themeParams:
if 'submitThemeDesignerReset=' in themeParams: if 'submitThemeDesignerReset=' in themeParams:
resetThemeDesignerSettings(base_dir, themeName, domain, resetThemeDesignerSettings(base_dir, themeName, domain,
allowLocalNetworkAccess, allow_local_network_access,
systemLanguage) systemLanguage)
setTheme(base_dir, themeName, domain, setTheme(base_dir, themeName, domain,
allowLocalNetworkAccess, systemLanguage) allow_local_network_access, systemLanguage)
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:
originPathStr = \ originPathStr = \
@ -2216,7 +2216,7 @@ class PubServer(BaseHTTPRequestHandler):
setThemeFromDesigner(base_dir, themeName, domain, setThemeFromDesigner(base_dir, themeName, domain,
themeDesignerParams, themeDesignerParams,
allowLocalNetworkAccess, allow_local_network_access,
systemLanguage) systemLanguage)
# set boolean values # set boolean values
@ -2724,7 +2724,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
self.server.signingPrivateKeyPem, self.server.signingPrivateKeyPem,
@ -2858,7 +2858,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
self.server.signingPrivateKeyPem, self.server.signingPrivateKeyPem,
@ -3307,7 +3307,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -3402,7 +3402,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, 'outbox', self.server.themeName, 'outbox',
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -3470,7 +3470,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, 'bookmarks', self.server.themeName, 'bookmarks',
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -3535,8 +3535,8 @@ class PubServer(BaseHTTPRequestHandler):
return return
else: else:
showPublishedDateOnly = self.server.showPublishedDateOnly showPublishedDateOnly = self.server.showPublishedDateOnly
allowLocalNetworkAccess = \ allow_local_network_access = \
self.server.allowLocalNetworkAccess self.server.allow_local_network_access
accessKeys = self.server.accessKeys accessKeys = self.server.accessKeys
if self.server.keyShortcuts.get(nickname): if self.server.keyShortcuts.get(nickname):
@ -3568,7 +3568,7 @@ class PubServer(BaseHTTPRequestHandler):
showPublishedDateOnly, showPublishedDateOnly,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.peertubeInstances, self.server.peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
self.server.themeName, self.server.themeName,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -4052,7 +4052,7 @@ class PubServer(BaseHTTPRequestHandler):
domain: str, domainFull: str, domain: str, domainFull: str,
onionDomain: str, i2pDomain: str, debug: bool, onionDomain: str, i2pDomain: str, debug: bool,
defaultTimeline: str, defaultTimeline: str,
allowLocalNetworkAccess: bool) -> None: allow_local_network_access: bool) -> None:
"""Updates the left links column of the timeline """Updates the left links column of the timeline
""" """
usersPath = path.replace('/linksdata', '') usersPath = path.replace('/linksdata', '')
@ -4151,7 +4151,7 @@ class PubServer(BaseHTTPRequestHandler):
if fields.get('editedAbout'): if fields.get('editedAbout'):
aboutStr = fields['editedAbout'] aboutStr = fields['editedAbout']
if not dangerousMarkup(aboutStr, if not dangerousMarkup(aboutStr,
allowLocalNetworkAccess): allow_local_network_access):
try: try:
with open(aboutFilename, 'w+') as aboutFile: with open(aboutFilename, 'w+') as aboutFile:
aboutFile.write(aboutStr) aboutFile.write(aboutStr)
@ -4168,7 +4168,7 @@ class PubServer(BaseHTTPRequestHandler):
if fields.get('editedTOS'): if fields.get('editedTOS'):
TOSStr = fields['editedTOS'] TOSStr = fields['editedTOS']
if not dangerousMarkup(TOSStr, if not dangerousMarkup(TOSStr,
allowLocalNetworkAccess): allow_local_network_access):
try: try:
with open(TOSFilename, 'w+') as TOSFile: with open(TOSFilename, 'w+') as TOSFile:
TOSFile.write(TOSStr) TOSFile.write(TOSStr)
@ -4193,7 +4193,7 @@ class PubServer(BaseHTTPRequestHandler):
domain: str, domainFull: str, domain: str, domainFull: str,
onionDomain: str, i2pDomain: str, debug: bool, onionDomain: str, i2pDomain: str, debug: bool,
defaultTimeline: str, defaultTimeline: str,
allowLocalNetworkAccess: bool) -> None: allow_local_network_access: bool) -> None:
"""On the screen after selecting a hashtag from the swarm, this sets """On the screen after selecting a hashtag from the swarm, this sets
the category for that tag the category for that tag
""" """
@ -4673,7 +4673,7 @@ class PubServer(BaseHTTPRequestHandler):
base_dir: str, http_prefix: str, base_dir: str, http_prefix: str,
domain: str, domainFull: str, domain: str, domainFull: str,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
debug: bool, allowLocalNetworkAccess: bool, debug: bool, allow_local_network_access: bool,
systemLanguage: str, content_license_url: str) -> None: systemLanguage: str, content_license_url: str) -> None:
"""Updates your user profile after editing via the Edit button """Updates your user profile after editing via the Edit button
on the profile screen on the profile screen
@ -5009,7 +5009,8 @@ class PubServer(BaseHTTPRequestHandler):
if fields.get('themeDropdown'): if fields.get('themeDropdown'):
self.server.themeName = fields['themeDropdown'] self.server.themeName = fields['themeDropdown']
setTheme(base_dir, self.server.themeName, domain, setTheme(base_dir, self.server.themeName, domain,
allowLocalNetworkAccess, systemLanguage) allow_local_network_access,
systemLanguage)
self.server.textModeBanner = \ self.server.textModeBanner = \
getTextModeBanner(self.server.base_dir) getTextModeBanner(self.server.base_dir)
self.server.iconsCache = {} self.server.iconsCache = {}
@ -5945,10 +5946,10 @@ class PubServer(BaseHTTPRequestHandler):
currTheme = getTheme(base_dir) currTheme = getTheme(base_dir)
if currTheme: if currTheme:
self.server.themeName = currTheme self.server.themeName = currTheme
allowLocalNetworkAccess = \ allow_local_network_access = \
self.server.allowLocalNetworkAccess self.server.allow_local_network_access
setTheme(base_dir, currTheme, domain, setTheme(base_dir, currTheme, domain,
allowLocalNetworkAccess, allow_local_network_access,
systemLanguage) systemLanguage)
self.server.textModeBanner = \ self.server.textModeBanner = \
getTextModeBanner(base_dir) getTextModeBanner(base_dir)
@ -7545,7 +7546,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -7757,7 +7758,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -8217,7 +8218,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -8371,7 +8372,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -8555,7 +8556,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -8727,7 +8728,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -8825,7 +8826,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -8947,7 +8948,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9075,7 +9076,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9172,7 +9173,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9277,7 +9278,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9387,7 +9388,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9509,7 +9510,7 @@ class PubServer(BaseHTTPRequestHandler):
twitterReplacementDomain, twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
peertubeInstances, peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9601,7 +9602,7 @@ class PubServer(BaseHTTPRequestHandler):
twitterReplacementDomain, twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
peertubeInstances, peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -9707,7 +9708,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.dormant_months, self.server.dormant_months,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
self.server.debug, self.server.debug,
accessKeys, city, accessKeys, city,
@ -9783,8 +9784,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishedDateOnly self.server.showPublishedDateOnly
iconsAsButtons = \ iconsAsButtons = \
self.server.iconsAsButtons self.server.iconsAsButtons
allowLocalNetworkAccess = \ allow_local_network_access = \
self.server.allowLocalNetworkAccess self.server.allow_local_network_access
accessKeys = self.server.accessKeys accessKeys = self.server.accessKeys
if self.server.keyShortcuts.get(nickname): if self.server.keyShortcuts.get(nickname):
accessKeys = \ accessKeys = \
@ -9823,7 +9824,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.dormant_months, self.server.dormant_months,
self.server.peertubeInstances, self.server.peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
self.server.debug, self.server.debug,
accessKeys, city, accessKeys, city,
@ -9991,7 +9992,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.themeName, self.server.themeName,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
@ -10254,7 +10255,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -10371,6 +10372,8 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \
self.server.allow_local_network_access
msg = \ msg = \
htmlInboxDMs(self.server.cssCache, htmlInboxDMs(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -10402,7 +10405,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publishButtonAtTop, self.server.publishButtonAtTop,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -10512,6 +10515,8 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \
self.server.allow_local_network_access
msg = \ msg = \
htmlInboxReplies(self.server.cssCache, htmlInboxReplies(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -10543,7 +10548,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publishButtonAtTop, self.server.publishButtonAtTop,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -10685,7 +10690,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -10827,7 +10832,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -10979,7 +10984,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11094,6 +11099,8 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \
self.server.allow_local_network_access
msg = \ msg = \
htmlInboxFeatures(self.server.cssCache, htmlInboxFeatures(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -11126,7 +11133,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11232,7 +11239,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publishButtonAtTop, self.server.publishButtonAtTop,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11316,7 +11323,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.publishButtonAtTop, self.server.publishButtonAtTop,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11405,6 +11412,8 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
allow_local_network_access = \
self.server.allow_local_network_access
msg = \ msg = \
htmlBookmarks(self.server.cssCache, htmlBookmarks(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -11437,7 +11446,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11575,7 +11584,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, authorized,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11674,6 +11683,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
twitterReplacementDomain = \ twitterReplacementDomain = \
self.server.twitterReplacementDomain self.server.twitterReplacementDomain
allow_local_network_access = \
self.server.allow_local_network_access
msg = \ msg = \
htmlModeration(self.server.cssCache, htmlModeration(self.server.cssCache,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -11705,7 +11716,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, moderationActionStr, authorized, moderationActionStr,
self.server.themeName, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
accessKeys, accessKeys,
self.server.systemLanguage, self.server.systemLanguage,
@ -11825,7 +11836,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.dormant_months, self.server.dormant_months,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
self.server.debug, self.server.debug,
accessKeys, city, accessKeys, city,
@ -11946,7 +11957,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.dormant_months, self.server.dormant_months,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
self.server.debug, self.server.debug,
accessKeys, city, accessKeys, city,
@ -12066,7 +12077,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.dormant_months, self.server.dormant_months,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
self.server.debug, self.server.debug,
accessKeys, city, accessKeys, city,
@ -12202,7 +12213,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
self.server.dormant_months, self.server.dormant_months,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.textModeBanner, self.server.textModeBanner,
self.server.debug, self.server.debug,
accessKeys, city, accessKeys, city,
@ -12966,7 +12977,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.twitterReplacementDomain, self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.peertubeInstances, self.server.peertubeInstances,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.systemLanguage, self.server.systemLanguage,
self.server.max_like_count, self.server.max_like_count,
self.server.signingPrivateKeyPem, self.server.signingPrivateKeyPem,
@ -17558,7 +17569,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.i2pDomain, self.server.i2pDomain,
self.server.debug, self.server.debug,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.allowLocalNetworkAccess) self.server.allow_local_network_access)
self.server.POSTbusy = False self.server.POSTbusy = False
return return
@ -17571,7 +17582,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.domainFull, self.server.domainFull,
self.server.onionDomain, self.server.onionDomain,
self.server.i2pDomain, self.server.debug, self.server.i2pDomain, self.server.debug,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.systemLanguage, self.server.systemLanguage,
self.server.content_license_url) self.server.content_license_url)
self.server.POSTbusy = False self.server.POSTbusy = False
@ -17585,7 +17596,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.onionDomain, self.server.onionDomain,
self.server.i2pDomain, self.server.debug, self.server.i2pDomain, self.server.debug,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.allowLocalNetworkAccess) self.server.allow_local_network_access)
self.server.POSTbusy = False self.server.POSTbusy = False
return return
@ -17913,7 +17924,7 @@ class PubServer(BaseHTTPRequestHandler):
accessKeys, accessKeys,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.themeName, self.server.themeName,
self.server.allowLocalNetworkAccess, self.server.allow_local_network_access,
self.server.systemLanguage) self.server.systemLanguage)
self.server.POSTbusy = False self.server.POSTbusy = False
return return
@ -18416,7 +18427,7 @@ def runDaemon(content_license_url: str,
send_threads_timeout_mins: int, send_threads_timeout_mins: int,
dormant_months: int, dormant_months: int,
max_newswire_posts: int, max_newswire_posts: int,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
maxFeedItemSizeKb: int, maxFeedItemSizeKb: int,
publishButtonAtTop: bool, publishButtonAtTop: bool,
rssIconAtTop: bool, rssIconAtTop: bool,
@ -18565,10 +18576,10 @@ def runDaemon(content_license_url: str,
httpd.user_agents_blocked = user_agents_blocked httpd.user_agents_blocked = user_agents_blocked
httpd.unitTest = unitTest httpd.unitTest = unitTest
httpd.allowLocalNetworkAccess = allowLocalNetworkAccess httpd.allow_local_network_access = allow_local_network_access
if unitTest: if unitTest:
# unit tests are run on the local network with LAN addresses # unit tests are run on the local network with LAN addresses
httpd.allowLocalNetworkAccess = True httpd.allow_local_network_access = True
httpd.yt_replace_domain = yt_replace_domain httpd.yt_replace_domain = yt_replace_domain
httpd.twitterReplacementDomain = twitterReplacementDomain httpd.twitterReplacementDomain = twitterReplacementDomain
@ -18905,7 +18916,7 @@ def runDaemon(content_license_url: str,
httpd.twitterReplacementDomain, httpd.twitterReplacementDomain,
httpd.showPublishedDateOnly, httpd.showPublishedDateOnly,
httpd.maxFollowers, httpd.maxFollowers,
httpd.allowLocalNetworkAccess, httpd.allow_local_network_access,
httpd.peertubeInstances, httpd.peertubeInstances,
verify_all_signatures, verify_all_signatures,
httpd.themeName, httpd.themeName,

8
desktop_client.py
View File

@ -696,7 +696,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
actor = postJsonObject['actor'] actor = postJsonObject['actor']
nameStr = getNicknameFromActor(actor) nameStr = getNicknameFromActor(actor)
recentPostsCache = {} recentPostsCache = {}
allowLocalNetworkAccess = False allow_local_network_access = False
yt_replace_domain = None yt_replace_domain = None
twitterReplacementDomain = None twitterReplacementDomain = None
postJsonObject2 = \ postJsonObject2 = \
@ -707,7 +707,7 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, False, recentPostsCache, False,
systemLanguage, systemLanguage,
domainFull, personCache, domainFull, personCache,
@ -2394,7 +2394,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str,
if postJsonObject: if postJsonObject:
if postJsonObject['type'] == 'Announce': if postJsonObject['type'] == 'Announce':
recentPostsCache = {} recentPostsCache = {}
allowLocalNetworkAccess = False allow_local_network_access = False
yt_replace_domain = None yt_replace_domain = None
twitterReplacementDomain = None twitterReplacementDomain = None
postJsonObject2 = \ postJsonObject2 = \
@ -2405,7 +2405,7 @@ def runDesktopClient(base_dir: str, proxyType: str, http_prefix: str,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, False, recentPostsCache, False,
systemLanguage, systemLanguage,
domainFull, personCache, domainFull, personCache,

16
epicyon.py
View File

@ -364,8 +364,8 @@ parser.add_argument("--publishButtonAtTop",
const=True, default=False, const=True, default=False,
help="Whether to show the publish button at the top of " + help="Whether to show the publish button at the top of " +
"the newswire column") "the newswire column")
parser.add_argument("--allowLocalNetworkAccess", parser.add_argument("--allow_local_network_access",
dest='allowLocalNetworkAccess', dest='allow_local_network_access',
type=str2bool, nargs='?', type=str2bool, nargs='?',
const=True, default=False, const=True, default=False,
help="Whether to allow access to local network " + help="Whether to allow access to local network " +
@ -3103,10 +3103,10 @@ fullWidthTimelineButtonHeader = \
if fullWidthTimelineButtonHeader is not None: if fullWidthTimelineButtonHeader is not None:
args.fullWidthTimelineButtonHeader = bool(fullWidthTimelineButtonHeader) args.fullWidthTimelineButtonHeader = bool(fullWidthTimelineButtonHeader)
allowLocalNetworkAccess = \ allow_local_network_access = \
getConfigParam(base_dir, 'allowLocalNetworkAccess') getConfigParam(base_dir, 'allow_local_network_access')
if allowLocalNetworkAccess is not None: if allow_local_network_access is not None:
args.allowLocalNetworkAccess = bool(allowLocalNetworkAccess) args.allow_local_network_access = bool(allow_local_network_access)
verify_all_signatures = \ verify_all_signatures = \
getConfigParam(base_dir, 'verify_all_signatures') getConfigParam(base_dir, 'verify_all_signatures')
@ -3181,7 +3181,7 @@ if twitterDomain:
args.twitterReplacementDomain = twitterDomain args.twitterReplacementDomain = twitterDomain
if setTheme(base_dir, themeName, domain, if setTheme(base_dir, themeName, domain,
args.allowLocalNetworkAccess, args.language): args.allow_local_network_access, args.language):
print('Theme set to ' + themeName) print('Theme set to ' + themeName)
# whether new registrations are open or closed # whether new registrations are open or closed
@ -3225,7 +3225,7 @@ if __name__ == "__main__":
args.send_threads_timeout_mins, args.send_threads_timeout_mins,
args.dormant_months, args.dormant_months,
args.max_newswire_posts, args.max_newswire_posts,
args.allowLocalNetworkAccess, args.allow_local_network_access,
args.maxFeedItemSizeKb, args.maxFeedItemSizeKb,
args.publishButtonAtTop, args.publishButtonAtTop,
args.rssIconAtTop, args.rssIconAtTop,

70
inbox.py
View File

@ -287,7 +287,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
allowDeletion: bool, boxname: str, allowDeletion: bool, boxname: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
@ -314,7 +314,7 @@ def _inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
http_prefix, __version__, boxname, http_prefix, __version__, boxname,
yt_replace_domain, twitterReplacementDomain, yt_replace_domain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, allowLocalNetworkAccess, peertubeInstances, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,
notDM, True, True, False, True, False, notDM, True, True, False, True, False,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1002,7 +1002,7 @@ def _receiveLike(recentPostsCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, CWlists: {}, max_like_count: int, CWlists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
@ -1102,7 +1102,7 @@ def _receiveLike(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1124,7 +1124,7 @@ def _receiveUndoLike(recentPostsCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, CWlists: {}, max_like_count: int, CWlists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
@ -1213,7 +1213,7 @@ def _receiveUndoLike(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1236,7 +1236,7 @@ def _receiveReaction(recentPostsCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, CWlists: {}, max_like_count: int, CWlists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
@ -1361,7 +1361,7 @@ def _receiveReaction(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1383,7 +1383,7 @@ def _receiveUndoReaction(recentPostsCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, CWlists: {}, max_like_count: int, CWlists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
@ -1488,7 +1488,7 @@ def _receiveUndoReaction(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1509,7 +1509,7 @@ def _receiveBookmark(recentPostsCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, CWlists: {}, max_like_count: int, CWlists: {},
lists_enabled: {}) -> bool: lists_enabled: {}) -> bool:
@ -1598,7 +1598,7 @@ def _receiveBookmark(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1619,7 +1619,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, CWlists: {}, max_like_count: int, CWlists: {},
lists_enabled: str) -> bool: lists_enabled: str) -> bool:
@ -1709,7 +1709,7 @@ def _receiveUndoBookmark(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1802,7 +1802,7 @@ def _receiveAnnounce(recentPostsCache: {},
debug: bool, translate: {}, debug: bool, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
maxRecentPosts: int, maxRecentPosts: int,
@ -1916,7 +1916,7 @@ def _receiveAnnounce(recentPostsCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -1937,7 +1937,7 @@ def _receiveAnnounce(recentPostsCache: {},
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, debug, recentPostsCache, debug,
systemLanguage, systemLanguage,
domainFull, personCache, domainFull, personCache,
@ -2186,7 +2186,7 @@ def _estimateNumberOfEmoji(content: str) -> int:
def _validPostContent(base_dir: str, nickname: str, domain: str, def _validPostContent(base_dir: str, nickname: str, domain: str,
messageJson: {}, maxMentions: int, maxEmoji: int, messageJson: {}, maxMentions: int, maxEmoji: int,
allowLocalNetworkAccess: bool, debug: bool, allow_local_network_access: bool, debug: bool,
systemLanguage: str, systemLanguage: str,
http_prefix: str, domainFull: str, http_prefix: str, domainFull: str,
personCache: {}) -> bool: personCache: {}) -> bool:
@ -2229,7 +2229,7 @@ def _validPostContent(base_dir: str, nickname: str, domain: str,
return True return True
contentStr = getBaseContentFromPost(messageJson, systemLanguage) contentStr = getBaseContentFromPost(messageJson, systemLanguage)
if dangerousMarkup(contentStr, allowLocalNetworkAccess): if dangerousMarkup(contentStr, allow_local_network_access):
if messageJson['object'].get('id'): if messageJson['object'].get('id'):
print('REJECT ARBITRARY HTML: ' + messageJson['object']['id']) print('REJECT ARBITRARY HTML: ' + messageJson['object']['id'])
print('REJECT ARBITRARY HTML: bad string in post - ' + print('REJECT ARBITRARY HTML: bad string in post - ' +
@ -2983,7 +2983,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
CWlists: {}, lists_enabled: bool) -> None: CWlists: {}, lists_enabled: bool) -> None:
@ -3028,7 +3028,7 @@ def _receiveQuestionVote(base_dir: str, nickname: str, domain: str,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, notDM, max_like_count, notDM,
showIndividualPostIcons, showIndividualPostIcons,
@ -3190,7 +3190,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
peertubeInstances: [], peertubeInstances: [],
lastBounceMessage: [], lastBounceMessage: [],
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -3226,7 +3226,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, CWlists, lists_enabled): max_like_count, CWlists, lists_enabled):
if debug: if debug:
@ -3248,7 +3248,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, CWlists, lists_enabled): max_like_count, CWlists, lists_enabled):
if debug: if debug:
@ -3271,7 +3271,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, CWlists, lists_enabled): max_like_count, CWlists, lists_enabled):
if debug: if debug:
@ -3293,7 +3293,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, CWlists, lists_enabled): max_like_count, CWlists, lists_enabled):
if debug: if debug:
@ -3315,7 +3315,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, CWlists, lists_enabled): max_like_count, CWlists, lists_enabled):
if debug: if debug:
@ -3337,7 +3337,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, CWlists, lists_enabled): max_like_count, CWlists, lists_enabled):
if debug: if debug:
@ -3359,7 +3359,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
debug, translate, debug, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
signingPrivateKeyPem, signingPrivateKeyPem,
maxRecentPosts, maxRecentPosts,
@ -3415,7 +3415,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
domainFull = getFullDomain(domain, port) domainFull = getFullDomain(domain, port)
if _validPostContent(base_dir, nickname, domain, if _validPostContent(base_dir, nickname, domain,
postJsonObject, maxMentions, maxEmoji, postJsonObject, maxMentions, maxEmoji,
allowLocalNetworkAccess, debug, allow_local_network_access, debug,
systemLanguage, http_prefix, systemLanguage, http_prefix,
domainFull, personCache): domainFull, personCache):
# is the sending actor valid? # is the sending actor valid?
@ -3459,7 +3459,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -3500,7 +3500,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
translate, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, debug, systemLanguage, recentPostsCache, debug, systemLanguage,
domainFull, personCache, signingPrivateKeyPem): domainFull, personCache, signingPrivateKeyPem):
# media index will be updated # media index will be updated
@ -3564,7 +3564,7 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
boxname, boxname,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
signingPrivateKeyPem, signingPrivateKeyPem,
@ -4075,7 +4075,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
maxFollowers: int, maxFollowers: int,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
peertubeInstances: [], peertubeInstances: [],
verify_all_signatures: bool, verify_all_signatures: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
@ -4505,7 +4505,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
allowLocalNetworkAccess, allow_local_network_access,
peertubeInstances, peertubeInstances,
lastBounceMessage, lastBounceMessage,
themeName, systemLanguage, themeName, systemLanguage,

8
newsdaemon.py
View File

@ -543,7 +543,7 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str,
federationList: [], federationList: [],
sendThreads: [], postLog: [], sendThreads: [], postLog: [],
maxMirroredArticles: int, maxMirroredArticles: int,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
systemLanguage: str, systemLanguage: str,
low_bandwidth: bool, low_bandwidth: bool,
content_license_url: str) -> None: content_license_url: str) -> None:
@ -598,8 +598,8 @@ def _convertRSStoActivityPub(base_dir: str, http_prefix: str,
rssTitle = _removeControlCharacters(item[0]) rssTitle = _removeControlCharacters(item[0])
url = item[1] url = item[1]
if dangerousMarkup(url, allowLocalNetworkAccess) or \ if dangerousMarkup(url, allow_local_network_access) or \
dangerousMarkup(rssTitle, allowLocalNetworkAccess): dangerousMarkup(rssTitle, allow_local_network_access):
continue continue
rssDescription = '' rssDescription = ''
@ -834,7 +834,7 @@ def runNewswireDaemon(base_dir: str, httpd,
httpd.sendThreads, httpd.sendThreads,
httpd.postLog, httpd.postLog,
httpd.maxMirroredArticles, httpd.maxMirroredArticles,
httpd.allowLocalNetworkAccess, httpd.allow_local_network_access,
httpd.systemLanguage, httpd.systemLanguage,
httpd.low_bandwidth, httpd.low_bandwidth,
httpd.content_license_url) httpd.content_license_url)

10
outbox.py
View File

@ -190,7 +190,7 @@ def postMessageToOutbox(session, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
city: str, systemLanguage: str, city: str, systemLanguage: str,
shared_items_federated_domains: [], shared_items_federated_domains: [],
sharedItemFederationTokens: {}, sharedItemFederationTokens: {},
@ -225,7 +225,7 @@ def postMessageToOutbox(session, translate: {},
if hasObjectDict(messageJson): if hasObjectDict(messageJson):
contentStr = getBaseContentFromPost(messageJson, systemLanguage) contentStr = getBaseContentFromPost(messageJson, systemLanguage)
if contentStr: if contentStr:
if dangerousMarkup(contentStr, allowLocalNetworkAccess): if dangerousMarkup(contentStr, allow_local_network_access):
print('POST to outbox contains dangerous markup: ' + print('POST to outbox contains dangerous markup: ' +
str(messageJson)) str(messageJson))
return False return False
@ -273,7 +273,7 @@ def postMessageToOutbox(session, translate: {},
return False return False
# sent by an actor on a local network address? # sent by an actor on a local network address?
if not allowLocalNetworkAccess: if not allow_local_network_access:
localNetworkPatternList = getLocalNetworkAddresses() localNetworkPatternList = getLocalNetworkAddresses()
for localNetworkPattern in localNetworkPatternList: for localNetworkPattern in localNetworkPatternList:
if localNetworkPattern in messageJson['actor']: if localNetworkPattern in messageJson['actor']:
@ -425,7 +425,7 @@ def postMessageToOutbox(session, translate: {},
translate, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, debug, systemLanguage, recentPostsCache, debug, systemLanguage,
domainFull, personCache, domainFull, personCache,
signingPrivateKeyPem): signingPrivateKeyPem):
@ -468,7 +468,7 @@ def postMessageToOutbox(session, translate: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
theme, systemLanguage, theme, systemLanguage,
max_like_count, max_like_count,
boxNameIndex != 'dm', boxNameIndex != 'dm',

8
posts.py
View File

@ -3455,7 +3455,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str,
postJsonObject: {}, translate: {}, postJsonObject: {}, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
recentPostsCache: {}, debug: bool, recentPostsCache: {}, debug: bool,
systemLanguage: str, systemLanguage: str,
domainFull: str, personCache: {}, domainFull: str, personCache: {},
@ -3470,7 +3470,7 @@ def isImageMedia(session, base_dir: str, http_prefix: str,
__version__, translate, __version__, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, debug, recentPostsCache, debug,
systemLanguage, systemLanguage,
domainFull, personCache, domainFull, personCache,
@ -4506,7 +4506,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str,
translate: {}, translate: {},
yt_replace_domain: str, yt_replace_domain: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
recentPostsCache: {}, debug: bool, recentPostsCache: {}, debug: bool,
systemLanguage: str, systemLanguage: str,
domainFull: str, personCache: {}, domainFull: str, personCache: {},
@ -4660,7 +4660,7 @@ def downloadAnnounce(session, base_dir: str, http_prefix: str,
return None return None
# Check the content of the announce # Check the content of the announce
contentStr = announcedJson['content'] contentStr = announcedJson['content']
if dangerousMarkup(contentStr, allowLocalNetworkAccess): if dangerousMarkup(contentStr, allow_local_network_access):
_rejectAnnounce(announceFilename, _rejectAnnounce(announceFilename,
base_dir, nickname, domain, postId, base_dir, nickname, domain, postId,
recentPostsCache) recentPostsCache)

2
schedule.py
View File

@ -117,7 +117,7 @@ def _updatePostSchedule(base_dir: str, handle: str, httpd,
httpd.yt_replace_domain, httpd.yt_replace_domain,
httpd.twitterReplacementDomain, httpd.twitterReplacementDomain,
httpd.showPublishedDateOnly, httpd.showPublishedDateOnly,
httpd.allowLocalNetworkAccess, httpd.allow_local_network_access,
httpd.city, httpd.systemLanguage, httpd.city, httpd.systemLanguage,
httpd.shared_items_federated_domains, httpd.shared_items_federated_domains,
httpd.sharedItemFederationTokens, httpd.sharedItemFederationTokens,

46
tests.py
View File

@ -779,7 +779,7 @@ def createServerAlice(path: str, domain: str, port: int,
maxEmoji = 10 maxEmoji = 10
onionDomain = None onionDomain = None
i2pDomain = None i2pDomain = None
allowLocalNetworkAccess = True allow_local_network_access = True
max_newswire_posts = 20 max_newswire_posts = 20
dormant_months = 3 dormant_months = 3
send_threads_timeout_mins = 30 send_threads_timeout_mins = 30
@ -808,7 +808,7 @@ def createServerAlice(path: str, domain: str, port: int,
verify_all_signatures, verify_all_signatures,
send_threads_timeout_mins, send_threads_timeout_mins,
dormant_months, max_newswire_posts, dormant_months, max_newswire_posts,
allowLocalNetworkAccess, allow_local_network_access,
2048, False, True, False, False, True, maxFollowers, 2048, False, True, False, False, True, maxFollowers,
0, 100, 1024, 5, False, 0, 100, 1024, 5, False,
0, False, 1, False, False, False, 0, False, 1, False, False, False,
@ -921,7 +921,7 @@ def createServerBob(path: str, domain: str, port: int,
maxEmoji = 10 maxEmoji = 10
onionDomain = None onionDomain = None
i2pDomain = None i2pDomain = None
allowLocalNetworkAccess = True allow_local_network_access = True
max_newswire_posts = 20 max_newswire_posts = 20
dormant_months = 3 dormant_months = 3
send_threads_timeout_mins = 30 send_threads_timeout_mins = 30
@ -950,7 +950,7 @@ def createServerBob(path: str, domain: str, port: int,
verify_all_signatures, verify_all_signatures,
send_threads_timeout_mins, send_threads_timeout_mins,
dormant_months, max_newswire_posts, dormant_months, max_newswire_posts,
allowLocalNetworkAccess, allow_local_network_access,
2048, False, True, False, False, True, maxFollowers, 2048, False, True, False, False, True, maxFollowers,
0, 100, 1024, 5, False, 0, 0, 100, 1024, 5, False, 0,
False, 1, False, False, False, False, 1, False, False, False,
@ -990,7 +990,7 @@ def createServerEve(path: str, domain: str, port: int, federationList: [],
maxEmoji = 10 maxEmoji = 10
onionDomain = None onionDomain = None
i2pDomain = None i2pDomain = None
allowLocalNetworkAccess = True allow_local_network_access = True
max_newswire_posts = 20 max_newswire_posts = 20
dormant_months = 3 dormant_months = 3
send_threads_timeout_mins = 30 send_threads_timeout_mins = 30
@ -1020,7 +1020,7 @@ def createServerEve(path: str, domain: str, port: int, federationList: [],
verify_all_signatures, verify_all_signatures,
send_threads_timeout_mins, send_threads_timeout_mins,
dormant_months, max_newswire_posts, dormant_months, max_newswire_posts,
allowLocalNetworkAccess, allow_local_network_access,
2048, False, True, False, False, True, maxFollowers, 2048, False, True, False, False, True, maxFollowers,
0, 100, 1024, 5, False, 0, 0, 100, 1024, 5, False, 0,
False, 1, False, False, False, False, 1, False, False, False,
@ -1062,7 +1062,7 @@ def createServerGroup(path: str, domain: str, port: int,
maxEmoji = 10 maxEmoji = 10
onionDomain = None onionDomain = None
i2pDomain = None i2pDomain = None
allowLocalNetworkAccess = True allow_local_network_access = True
max_newswire_posts = 20 max_newswire_posts = 20
dormant_months = 3 dormant_months = 3
send_threads_timeout_mins = 30 send_threads_timeout_mins = 30
@ -1092,7 +1092,7 @@ def createServerGroup(path: str, domain: str, port: int,
verify_all_signatures, verify_all_signatures,
send_threads_timeout_mins, send_threads_timeout_mins,
dormant_months, max_newswire_posts, dormant_months, max_newswire_posts,
allowLocalNetworkAccess, allow_local_network_access,
2048, False, True, False, False, True, maxFollowers, 2048, False, True, False, False, True, maxFollowers,
0, 100, 1024, 5, False, 0, 100, 1024, 5, False,
0, False, 1, False, False, False, 0, False, 1, False, False, False,
@ -3712,64 +3712,64 @@ def _testDangerousSVG(base_dir: str) -> None:
def _testDangerousMarkup(): def _testDangerousMarkup():
print('testDangerousMarkup') print('testDangerousMarkup')
allowLocalNetworkAccess = False allow_local_network_access = False
content = '<p>This is a valid message</p>' content = '<p>This is a valid message</p>'
assert(not dangerousMarkup(content, allowLocalNetworkAccess)) assert(not dangerousMarkup(content, allow_local_network_access))
content = 'This is a valid message without markup' content = 'This is a valid message without markup'
assert(not dangerousMarkup(content, allowLocalNetworkAccess)) assert(not dangerousMarkup(content, allow_local_network_access))
content = '<p>This is a valid-looking message. But wait... ' + \ content = '<p>This is a valid-looking message. But wait... ' + \
'<script>document.getElementById("concentrated")' + \ '<script>document.getElementById("concentrated")' + \
'.innerHTML = "evil";</script></p>' '.innerHTML = "evil";</script></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This is a valid-looking message. But wait... ' + \ content = '<p>This is a valid-looking message. But wait... ' + \
'&lt;script&gt;document.getElementById("concentrated")' + \ '&lt;script&gt;document.getElementById("concentrated")' + \
'.innerHTML = "evil";&lt;/script&gt;</p>' '.innerHTML = "evil";&lt;/script&gt;</p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This html contains more than you expected... ' + \ content = '<p>This html contains more than you expected... ' + \
'<script language="javascript">document.getElementById("abc")' + \ '<script language="javascript">document.getElementById("abc")' + \
'.innerHTML = "def";</script></p>' '.innerHTML = "def";</script></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This is a valid-looking message. But wait... ' + \ content = '<p>This is a valid-looking message. But wait... ' + \
'<script src="https://evilsite/payload.js" /></p>' '<script src="https://evilsite/payload.js" /></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This message embeds an evil frame.' + \ content = '<p>This message embeds an evil frame.' + \
'<iframe src="somesite"></iframe></p>' '<iframe src="somesite"></iframe></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This message tries to obfuscate an evil frame.' + \ content = '<p>This message tries to obfuscate an evil frame.' + \
'< iframe src = "somesite"></ iframe ></p>' '< iframe src = "somesite"></ iframe ></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This message is not necessarily evil, but annoying.' + \ content = '<p>This message is not necessarily evil, but annoying.' + \
'<hr><br><br><br><br><br><br><br><hr><hr></p>' '<hr><br><br><br><br><br><br><br><hr><hr></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This message contans a ' + \ content = '<p>This message contans a ' + \
'<a href="https://validsite/index.html">valid link.</a></p>' '<a href="https://validsite/index.html">valid link.</a></p>'
assert(not dangerousMarkup(content, allowLocalNetworkAccess)) assert(not dangerousMarkup(content, allow_local_network_access))
content = '<p>This message contans a ' + \ content = '<p>This message contans a ' + \
'<a href="https://validsite/iframe.html">' + \ '<a href="https://validsite/iframe.html">' + \
'valid link having invalid but harmless name.</a></p>' 'valid link having invalid but harmless name.</a></p>'
assert(not dangerousMarkup(content, allowLocalNetworkAccess)) assert(not dangerousMarkup(content, allow_local_network_access))
content = '<p>This message which <a href="127.0.0.1:8736">' + \ content = '<p>This message which <a href="127.0.0.1:8736">' + \
'tries to access the local network</a></p>' 'tries to access the local network</a></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>This message which <a href="http://192.168.5.10:7235">' + \ content = '<p>This message which <a href="http://192.168.5.10:7235">' + \
'tries to access the local network</a></p>' 'tries to access the local network</a></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allow_local_network_access))
content = '<p>127.0.0.1 This message which does not access ' + \ content = '<p>127.0.0.1 This message which does not access ' + \
'the local network</a></p>' 'the local network</a></p>'
assert(not dangerousMarkup(content, allowLocalNetworkAccess)) assert(not dangerousMarkup(content, allow_local_network_access))
def _runHtmlReplaceQuoteMarks(): def _runHtmlReplaceQuoteMarks():

28
theme.py
View File

@ -319,7 +319,7 @@ def setCSSparam(css: str, param: str, value: str) -> str:
def _setThemeFromDict(base_dir: str, name: str, def _setThemeFromDict(base_dir: str, name: str,
themeParams: {}, bgParams: {}, themeParams: {}, bgParams: {},
allowLocalNetworkAccess: bool) -> None: allow_local_network_access: bool) -> None:
"""Uses a dictionary to set a theme """Uses a dictionary to set a theme
""" """
if name: if name:
@ -334,7 +334,7 @@ def _setThemeFromDict(base_dir: str, name: str,
# Ensure that any custom CSS is mostly harmless. # Ensure that any custom CSS is mostly harmless.
# If not then just use the defaults # If not then just use the defaults
if dangerousCSS(templateFilename, allowLocalNetworkAccess) or \ if dangerousCSS(templateFilename, allow_local_network_access) or \
not os.path.isfile(templateFilename): not os.path.isfile(templateFilename):
# use default css # use default css
templateFilename = base_dir + '/epicyon-' + filename templateFilename = base_dir + '/epicyon-' + filename
@ -494,16 +494,16 @@ def _setCustomFont(base_dir: str):
def setThemeFromDesigner(base_dir: str, themeName: str, domain: str, def setThemeFromDesigner(base_dir: str, themeName: str, domain: str,
themeParams: {}, themeParams: {},
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
systemLanguage: str): systemLanguage: str):
customThemeFilename = base_dir + '/accounts/theme.json' customThemeFilename = base_dir + '/accounts/theme.json'
saveJson(themeParams, customThemeFilename) saveJson(themeParams, customThemeFilename)
setTheme(base_dir, themeName, domain, setTheme(base_dir, themeName, domain,
allowLocalNetworkAccess, systemLanguage) allow_local_network_access, systemLanguage)
def resetThemeDesignerSettings(base_dir: str, themeName: str, domain: str, def resetThemeDesignerSettings(base_dir: str, themeName: str, domain: str,
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
systemLanguage: str) -> None: systemLanguage: str) -> None:
"""Resets the theme designer settings """Resets the theme designer settings
""" """
@ -517,7 +517,7 @@ def resetThemeDesignerSettings(base_dir: str, themeName: str, domain: str,
def _readVariablesFile(base_dir: str, themeName: str, def _readVariablesFile(base_dir: str, themeName: str,
variablesFile: str, variablesFile: str,
allowLocalNetworkAccess: bool) -> None: allow_local_network_access: bool) -> None:
"""Reads variables from a file in the theme directory """Reads variables from a file in the theme directory
""" """
themeParams = loadJson(variablesFile, 0) themeParams = loadJson(variablesFile, 0)
@ -539,10 +539,10 @@ def _readVariablesFile(base_dir: str, themeName: str,
"search": "jpg" "search": "jpg"
} }
_setThemeFromDict(base_dir, themeName, themeParams, bgParams, _setThemeFromDict(base_dir, themeName, themeParams, bgParams,
allowLocalNetworkAccess) allow_local_network_access)
def _setThemeDefault(base_dir: str, allowLocalNetworkAccess: bool): def _setThemeDefault(base_dir: str, allow_local_network_access: bool):
name = 'default' name = 'default'
_removeTheme(base_dir) _removeTheme(base_dir)
_setThemeInConfig(base_dir, name) _setThemeInConfig(base_dir, name)
@ -563,7 +563,7 @@ def _setThemeDefault(base_dir: str, allowLocalNetworkAccess: bool):
"search-banner-height-mobile": "15vh" "search-banner-height-mobile": "15vh"
} }
_setThemeFromDict(base_dir, name, themeParams, bgParams, _setThemeFromDict(base_dir, name, themeParams, bgParams,
allowLocalNetworkAccess) allow_local_network_access)
def _setThemeFonts(base_dir: str, themeName: str) -> None: def _setThemeFonts(base_dir: str, themeName: str) -> None:
@ -815,7 +815,7 @@ def _setClearCacheFlag(base_dir: str) -> None:
def setTheme(base_dir: str, name: str, domain: str, def setTheme(base_dir: str, name: str, domain: str,
allowLocalNetworkAccess: bool, systemLanguage: str) -> bool: allow_local_network_access: bool, systemLanguage: str) -> bool:
"""Sets the theme with the given name as the current theme """Sets the theme with the given name as the current theme
""" """
result = False result = False
@ -825,7 +825,7 @@ def setTheme(base_dir: str, name: str, domain: str,
# if the theme has changed then remove any custom settings # if the theme has changed then remove any custom settings
if prevThemeName != name: if prevThemeName != name:
resetThemeDesignerSettings(base_dir, name, domain, resetThemeDesignerSettings(base_dir, name, domain,
allowLocalNetworkAccess, allow_local_network_access,
systemLanguage) systemLanguage)
_removeTheme(base_dir) _removeTheme(base_dir)
@ -836,7 +836,7 @@ def setTheme(base_dir: str, name: str, domain: str,
if name == themeNameLower: if name == themeNameLower:
try: try:
globals()['setTheme' + themeName](base_dir, globals()['setTheme' + themeName](base_dir,
allowLocalNetworkAccess) allow_local_network_access)
except BaseException: except BaseException:
print('EX: setTheme unable to set theme ' + themeName) print('EX: setTheme unable to set theme ' + themeName)
pass pass
@ -851,13 +851,13 @@ def setTheme(base_dir: str, name: str, domain: str,
if not result: if not result:
# default # default
_setThemeDefault(base_dir, allowLocalNetworkAccess) _setThemeDefault(base_dir, allow_local_network_access)
result = True result = True
variablesFile = base_dir + '/theme/' + name + '/theme.json' variablesFile = base_dir + '/theme/' + name + '/theme.json'
if os.path.isfile(variablesFile): if os.path.isfile(variablesFile):
_readVariablesFile(base_dir, name, variablesFile, _readVariablesFile(base_dir, name, variablesFile,
allowLocalNetworkAccess) allow_local_network_access)
_setCustomFont(base_dir) _setCustomFont(base_dir)

12
utils.py
View File

@ -842,7 +842,7 @@ def isLocalNetworkAddress(ipAddress: str) -> bool:
return False return False
def _isDangerousString(content: str, allowLocalNetworkAccess: bool, def _isDangerousString(content: str, allow_local_network_access: bool,
separators: [], invalidStrings: []) -> bool: separators: [], invalidStrings: []) -> bool:
"""Returns true if the given string is dangerous """Returns true if the given string is dangerous
""" """
@ -855,7 +855,7 @@ def _isDangerousString(content: str, allowLocalNetworkAccess: bool,
continue continue
contentSections = content.split(startChar) contentSections = content.split(startChar)
invalidPartials = () invalidPartials = ()
if not allowLocalNetworkAccess: if not allow_local_network_access:
invalidPartials = getLocalNetworkAddresses() invalidPartials = getLocalNetworkAddresses()
for markup in contentSections: for markup in contentSections:
if endChar not in markup: if endChar not in markup:
@ -875,7 +875,7 @@ def _isDangerousString(content: str, allowLocalNetworkAccess: bool,
return False return False
def dangerousMarkup(content: str, allowLocalNetworkAccess: bool) -> bool: def dangerousMarkup(content: str, allow_local_network_access: bool) -> bool:
"""Returns true if the given content contains dangerous html markup """Returns true if the given content contains dangerous html markup
""" """
separators = [['<', '>'], ['&lt;', '&gt;']] separators = [['<', '>'], ['&lt;', '&gt;']]
@ -885,18 +885,18 @@ def dangerousMarkup(content: str, allowLocalNetworkAccess: bool) -> bool:
'frame', 'iframe', 'html', 'body', 'frame', 'iframe', 'html', 'body',
'hr', 'allow-popups', 'allow-scripts' 'hr', 'allow-popups', 'allow-scripts'
] ]
return _isDangerousString(content, allowLocalNetworkAccess, return _isDangerousString(content, allow_local_network_access,
separators, invalidStrings) separators, invalidStrings)
def dangerousSVG(content: str, allowLocalNetworkAccess: bool) -> bool: def dangerousSVG(content: str, allow_local_network_access: bool) -> bool:
"""Returns true if the given svg file content contains dangerous scripts """Returns true if the given svg file content contains dangerous scripts
""" """
separators = [['<', '>'], ['&lt;', '&gt;']] separators = [['<', '>'], ['&lt;', '&gt;']]
invalidStrings = [ invalidStrings = [
'script' 'script'
] ]
return _isDangerousString(content, allowLocalNetworkAccess, return _isDangerousString(content, allow_local_network_access,
separators, invalidStrings) separators, invalidStrings)

4
webapp_confirm.py
View File

@ -34,7 +34,7 @@ def htmlConfirmDelete(cssCache: {},
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, signingPrivateKeyPem: str, max_like_count: int, signingPrivateKeyPem: str,
CWlists: {}, lists_enabled: str) -> str: CWlists: {}, lists_enabled: str) -> str:
@ -75,7 +75,7 @@ def htmlConfirmDelete(cssCache: {},
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, allowLocalNetworkAccess, peertubeInstances, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
CWlists, lists_enabled) CWlists, lists_enabled)

4
webapp_create_post.py
View File

@ -206,7 +206,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
systemLanguage: str, systemLanguage: str,
max_like_count: int, signingPrivateKeyPem: str, max_like_count: int, signingPrivateKeyPem: str,
CWlists: {}, lists_enabled: str, CWlists: {}, lists_enabled: str,
@ -275,7 +275,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
theme, systemLanguage, theme, systemLanguage,
max_like_count, max_like_count,
False, False, False, False, False, False,

8
webapp_frontscreen.py
View File

@ -32,7 +32,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
signingPrivateKeyPem: str, CWlists: {}, signingPrivateKeyPem: str, CWlists: {},
@ -78,7 +78,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
False, False, False, False, False, False,
@ -107,7 +107,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, theme: str, newswire: {}, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
accessKeys: {}, accessKeys: {},
systemLanguage: str, max_like_count: int, systemLanguage: str, max_like_count: int,
shared_items_federated_domains: [], shared_items_federated_domains: [],
@ -183,7 +183,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
theme, systemLanguage, theme, systemLanguage,
max_like_count, max_like_count,
signingPrivateKeyPem, signingPrivateKeyPem,

4
webapp_moderation.py
View File

@ -48,7 +48,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, moderationActionStr: str, authorized: bool, moderationActionStr: str,
theme: str, peertubeInstances: [], theme: str, peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -74,7 +74,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
showPublishAsIcon, fullWidthTimelineButtonHeader, showPublishAsIcon, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, moderationActionStr, theme, authorized, moderationActionStr, theme,
peertubeInstances, allowLocalNetworkAccess, peertubeInstances, allow_local_network_access,
textModeBanner, accessKeys, systemLanguage, textModeBanner, accessKeys, systemLanguage,
max_like_count, shared_items_federated_domains, max_like_count, shared_items_federated_domains,
signingPrivateKeyPem, CWlists, lists_enabled) signingPrivateKeyPem, CWlists, lists_enabled)

20
webapp_post.py
View File

@ -1335,7 +1335,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
showRepeats: bool, showRepeats: bool,
@ -1501,7 +1501,7 @@ def individualPostAsHtml(signingPrivateKeyPem: str,
projectVersion, translate, projectVersion, translate,
yt_replace_domain, yt_replace_domain,
twitterReplacementDomain, twitterReplacementDomain,
allowLocalNetworkAccess, allow_local_network_access,
recentPostsCache, False, recentPostsCache, False,
systemLanguage, systemLanguage,
domainFull, personCache, domainFull, personCache,
@ -2003,7 +2003,7 @@ def htmlIndividualPost(cssCache: {},
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, signingPrivateKeyPem: str, max_like_count: int, signingPrivateKeyPem: str,
CWlists: {}, lists_enabled: str) -> str: CWlists: {}, lists_enabled: str) -> str:
@ -2068,7 +2068,7 @@ def htmlIndividualPost(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, themeName, allow_local_network_access, themeName,
systemLanguage, max_like_count, systemLanguage, max_like_count,
False, authorized, False, False, False, False, False, authorized, False, False, False, False,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -2099,7 +2099,7 @@ def htmlIndividualPost(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
False, authorized, False, authorized,
@ -2134,7 +2134,7 @@ def htmlIndividualPost(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
False, authorized, False, authorized,
@ -2162,7 +2162,7 @@ def htmlPostReplies(cssCache: {},
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
signingPrivateKeyPem: str, CWlists: {}, signingPrivateKeyPem: str, CWlists: {},
@ -2186,7 +2186,7 @@ def htmlPostReplies(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
@ -2215,7 +2215,7 @@ def htmlEmojiReactionPicker(cssCache: {},
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, signingPrivateKeyPem: str, max_like_count: int, signingPrivateKeyPem: str,
CWlists: {}, lists_enabled: str, CWlists: {}, lists_enabled: str,
@ -2238,7 +2238,7 @@ def htmlEmojiReactionPicker(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,

14
webapp_profile.py
View File

@ -134,7 +134,7 @@ def htmlProfileAfterSearch(cssCache: {},
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
defaultTimeline: str, defaultTimeline: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, themeName: str,
accessKeys: {}, accessKeys: {},
systemLanguage: str, systemLanguage: str,
@ -344,7 +344,7 @@ def htmlProfileAfterSearch(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -552,7 +552,7 @@ def htmlProfile(signingPrivateKeyPem: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, theme: str, dormant_months: int, newswire: {}, theme: str, dormant_months: int,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
debug: bool, accessKeys: {}, city: str, debug: bool, accessKeys: {}, city: str,
systemLanguage: str, max_like_count: int, systemLanguage: str, max_like_count: int,
@ -580,7 +580,7 @@ def htmlProfile(signingPrivateKeyPem: str,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, theme, extraJson, newswire, theme, extraJson,
allowLocalNetworkAccess, accessKeys, allow_local_network_access, accessKeys,
systemLanguage, max_like_count, systemLanguage, max_like_count,
shared_items_federated_domains, None, shared_items_federated_domains, None,
pageNumber, maxItemsPerPage, CWlists, pageNumber, maxItemsPerPage, CWlists,
@ -962,7 +962,7 @@ def htmlProfile(signingPrivateKeyPem: str,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
theme, systemLanguage, theme, systemLanguage,
max_like_count, max_like_count,
signingPrivateKeyPem, signingPrivateKeyPem,
@ -1030,7 +1030,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
@ -1075,7 +1075,7 @@ def _htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, themeName, systemLanguage,
max_like_count, max_like_count,
False, False, False, False, False, False,

8
webapp_search.py
View File

@ -601,7 +601,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, boxName: str, themeName: str, boxName: str,
systemLanguage: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -688,7 +688,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, base_dir: str,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,
showIndividualPostIcons, showIndividualPostIcons,
showIndividualPostIcons, showIndividualPostIcons,
@ -714,7 +714,7 @@ def htmlHashtagSearch(cssCache: {},
twitterReplacementDomain: str, twitterReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
themeName: str, systemLanguage: str, themeName: str, systemLanguage: str,
max_like_count: int, max_like_count: int,
signingPrivateKeyPem: str, signingPrivateKeyPem: str,
@ -871,7 +871,7 @@ def htmlHashtagSearch(cssCache: {},
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
themeName, systemLanguage, max_like_count, themeName, systemLanguage, max_like_count,
showRepeats, showIcons, showRepeats, showIcons,
manuallyApprovesFollowers, manuallyApprovesFollowers,

48
webapp_timeline.py
View File

@ -442,7 +442,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
moderationActionStr: str, moderationActionStr: str,
theme: str, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -909,7 +909,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
twitterReplacementDomain, twitterReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
peertubeInstances, peertubeInstances,
allowLocalNetworkAccess, allow_local_network_access,
theme, systemLanguage, theme, systemLanguage,
max_like_count, max_like_count,
boxName != 'dm', boxName != 'dm',
@ -1136,7 +1136,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1166,7 +1166,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1191,7 +1191,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1221,7 +1221,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1247,7 +1247,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1277,7 +1277,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1303,7 +1303,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1333,7 +1333,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1359,7 +1359,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1384,7 +1384,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1410,7 +1410,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1436,7 +1436,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1462,7 +1462,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1488,7 +1488,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1514,7 +1514,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1540,7 +1540,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1567,7 +1567,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
authorized: bool, authorized: bool,
theme: str, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1592,7 +1592,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1618,7 +1618,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1643,7 +1643,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)
@ -1669,7 +1669,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
publishButtonAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
allowLocalNetworkAccess: bool, allow_local_network_access: bool,
textModeBanner: str, textModeBanner: str,
accessKeys: {}, systemLanguage: str, accessKeys: {}, systemLanguage: str,
max_like_count: int, max_like_count: int,
@ -1696,7 +1696,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
showPublishAsIcon, fullWidthTimelineButtonHeader, showPublishAsIcon, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publishButtonAtTop, iconsAsButtons, rssIconAtTop, publishButtonAtTop,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allowLocalNetworkAccess, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
shared_items_federated_domains, signingPrivateKeyPem, shared_items_federated_domains, signingPrivateKeyPem,
CWlists, lists_enabled) CWlists, lists_enabled)