Skip to content
Snippets Groups Projects

Check permissions on netrc file

Merged Leo P. Singer requested to merge leo-singer/lvalert:safe_netrc into master
Files
4
+ 3
5
@@ -17,11 +17,8 @@
# along with lvalert. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import netrc
import sys
import os
import time
import select
import logging
import libxml2
import getpass
@@ -32,6 +29,7 @@ from M2Crypto.SSL import Context
# pubsub import must come first because it overloads part of the
# StanzaProcessor class
from ligo.lvalert import pubsub
from ligo.lvalert.utils import safe_netrc
from pyxmpp.all import JID,Iq,Presence,Message,StreamError,TLSSettings
from pyxmpp.jabber.all import Client
@@ -150,8 +148,8 @@ if (opts.add_publisher or opts.create or opts.delete or opts.subscribe or opts.u
parser.error("--node must be provided")
try:
default_username, _, default_password = netrc.netrc(os.path.expanduser(opts.netrc)).authenticators(opts.server)
except:
default_username, _, default_password = safe_netrc(os.path.expanduser(opts.netrc)).authenticators(opts.server)
except IOError:
default_username, default_password = None, None
myusername = opts.username or default_username
Loading