quantum/cfwatch
1
0
Fork 0
mirror of https://github.com/quantum5/cfwatch.git synced 2025-04-24 11:31:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to require new CloudFlare API tokens

Browse source
This commit is contained in:
Quantum 2021-09-09 02:47:40 -04:00
parent 69b735b9cb
commit 1e1be94196
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.rst
View file

@ -33,8 +33,7 @@ Usage
When running ``cfwatch``, you must set the following environment variables: When running ``cfwatch``, you must set the following environment variables:
* ``CFWATCH_EMAIL`` to your CloudFlare login email (e.g. user@example.com) * ``CFWATCH_TOKEN`` to your CloudFlare API token (not the legacy API key)
* ``CFWATCH_TOKEN`` to your CloudFlare API key
.. |pypi| image:: https://img.shields.io/pypi/v/cfwatch.svg .. |pypi| image:: https://img.shields.io/pypi/v/cfwatch.svg
:target: https://pypi.python.org/pypi/cfwatch :target: https://pypi.python.org/pypi/cfwatch

17
cfwatch.py
View file

@ -24,14 +24,13 @@ log = logging.getLogger('cfwatch')
class CloudFlareMonitorHandler(FileSystemEventHandler): class CloudFlareMonitorHandler(FileSystemEventHandler):
def __init__(self, email, token, zone, prefix, dir='.'): def __init__(self, token, zone, prefix, dir='.'):
self.session = requests.Session() self.session = requests.Session()
self.to_purge = set() self.to_purge = set()
self.queue_lock = Lock() self.queue_lock = Lock()
self._trigger = Event() self._trigger = Event()
self._stop = False self._stop = False
self.email = email
self.token = token self.token = token
self.zone = self._get_zone(zone) self.zone = self._get_zone(zone)
self.prefix = prefix self.prefix = prefix
@ -71,8 +70,7 @@ class CloudFlareMonitorHandler(FileSystemEventHandler):
def cf_request(self, *args, **kwargs): def cf_request(self, *args, **kwargs):
headers = { headers = {
'X-Auth-Email': self.email, 'Authorization': 'Bearer %s' % (self.token,),
'X-Auth-Key': self.token,
} }
headers.update(kwargs.pop('headers', {})) headers.update(kwargs.pop('headers', {}))
kwargs['headers'] = headers kwargs['headers'] = headers
@ -152,20 +150,13 @@ def main():
logging.basicConfig(filename=args.log, format='%(asctime)-15s %(message)s', level=logging.INFO) logging.basicConfig(filename=args.log, format='%(asctime)-15s %(message)s', level=logging.INFO)
email = os.environ.get('CFWATCH_EMAIL')
token = os.environ.get('CFWATCH_TOKEN') token = os.environ.get('CFWATCH_TOKEN')
if not email:
print('CFWATCH_EMAIL environment variable must be set to CloudFlare login email '
'(e.g. user@example.com)', file=sys.stderr)
sys.exit(2)
if not token: if not token:
print('CFWATCH_TOKEN environment must set to CloudFlare API key ' print('CFWATCH_TOKEN environment must set to CloudFlare API token', file=sys.stderr)
'(e.g. c2547eb745079dac9320b638f5e225cf483cc5cfdda41)', file=sys.stderr)
sys.exit(2) sys.exit(2)
monitor = CloudFlareMonitorHandler(email, token, args.zone, args.prefix, args.dir) monitor = CloudFlareMonitorHandler(token, args.zone, args.prefix, args.dir)
monitor.run() monitor.run()