浏览代码

Fix to finish feature/commands merge (#28).

tags/v0.1^2
Ben Kurtovic 12 年前
父节点
当前提交
e9be04de37
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. +3
    -0
      earwigbot/config.py
  2. +1
    -0
      setup.py

+ 3
- 0
earwigbot/config.py 查看文件

@@ -27,6 +27,7 @@ import logging.handlers
from os import mkdir, path

from Crypto.Cipher import Blowfish
import bcrypt
import yaml

from earwigbot.exceptions import NoConfigError
@@ -263,6 +264,8 @@ class BotConfig(object):
if not self._decryption_cipher:
key = getpass("Enter key to decrypt bot passwords: ")
self._decryption_cipher = Blowfish.new(sha256(key).digest())
signature = self.metadata["signature"]
assert bcrypt.hashpw(key, signature) == signature
for node, nodes in self._decryptable_nodes:
self._decrypt(node, nodes)



+ 1
- 0
setup.py 查看文件

@@ -37,6 +37,7 @@ setup(
"mwparserfromhell >= 0.1", # Wikicode parsing
"oursql >= 0.9.3", # Talking with MediaWiki databases
"oauth2 >= 1.5.211", # Talking with Yahoo BOSS Search
"py-bcrypt >= 0.2", # Password hashing in config
"pycrypto >= 2.5", # Storing bot passwords and keys
"pytz >= 2012c", # Timezone handling
],


正在加载...
取消
保存