Merge pull request #22 from wasamasa/master
Use shlex to shell quote user input properly
This commit is contained in:
@@ -9,15 +9,16 @@ On OSX will use the built in 'say' command.
|
|||||||
|
|
||||||
import prof
|
import prof
|
||||||
import os
|
import os
|
||||||
|
import shlex
|
||||||
from sys import platform
|
from sys import platform
|
||||||
|
|
||||||
def say(message):
|
def say(message):
|
||||||
args = prof.settings_string_get("say", "args", "")
|
args = prof.settings_string_get("say", "args", "")
|
||||||
|
|
||||||
if platform == "darwin":
|
if platform == "darwin":
|
||||||
os.system("say " + args + " '" + message + "' 2>/dev/null")
|
os.system("say " + args + " " + shlex.quote(message) + " 2>/dev/null")
|
||||||
elif platform == "linux" or platform == "linux2":
|
elif platform == "linux" or platform == "linux2":
|
||||||
os.system("echo '" + message + "' | espeak " + args + " 2>/dev/null")
|
os.system("echo " + shlex.quote(message) + " | espeak " + args + " 2>/dev/null")
|
||||||
|
|
||||||
|
|
||||||
def prof_post_chat_message_display(barejid, resource, message):
|
def prof_post_chat_message_display(barejid, resource, message):
|
||||||
|
|||||||
Reference in New Issue
Block a user