Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow encrypted passwords" 

This reverts commit 505b3b198e.
pull/1579/head
Fabian Affolter 2016-03-19 22:19:08 +01:00
parent 505b3b198e
commit bb658412c4
2 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/http.py
View File

@ -32,8 +32,6 @@ from homeassistant.const import (
DOMAIN = "http" DOMAIN = "http"
REQUIREMENTS = ["passlib==1.6.5"]
CONF_API_PASSWORD = "api_password" CONF_API_PASSWORD = "api_password"
CONF_SERVER_HOST = "server_host" CONF_SERVER_HOST = "server_host"
CONF_SERVER_PORT = "server_port" CONF_SERVER_PORT = "server_port"
@ -178,8 +176,6 @@ class RequestHandler(SimpleHTTPRequestHandler):
def _handle_request(self, method): # pylint: disable=too-many-branches def _handle_request(self, method): # pylint: disable=too-many-branches
"""Perform some common checks and call appropriate method.""" """Perform some common checks and call appropriate method."""
from passlib import hash
url = urlparse(self.path) url = urlparse(self.path)
# Read query input. parse_qs gives a list for each value, we want last # Read query input. parse_qs gives a list for each value, we want last
@ -202,20 +198,12 @@ class RequestHandler(SimpleHTTPRequestHandler):
"Error parsing JSON", HTTP_UNPROCESSABLE_ENTITY) "Error parsing JSON", HTTP_UNPROCESSABLE_ENTITY)
return return
try:
self.authenticated = (hash.sha256_crypt.verify(
self.headers.get(HTTP_HEADER_HA_AUTH),
self.server.api_password) or
hash.sha256_crypt.verify(
data.get(DATA_API_PASSWORD),
self.server.api_password) or
self.verify_session())
except (TypeError, ValueError):
self.authenticated = (self.server.api_password is None or self.authenticated = (self.server.api_password is None or
self.headers.get(HTTP_HEADER_HA_AUTH) == self.headers.get(HTTP_HEADER_HA_AUTH) ==
self.server.api_password or self.server.api_password or
data.get(DATA_API_PASSWORD) == data.get(DATA_API_PASSWORD) ==
self.server.api_password) self.server.api_password or
self.verify_session())
if '_METHOD' in data: if '_METHOD' in data:
method = data.pop('_METHOD') method = data.pop('_METHOD')

15
script/gen_hash.py
View File

@ -1,15 +0,0 @@
#!/usr/bin/python3
"""Generate hashes from given strings."""
import getpass
from passlib import hash
response1 = getpass.getpass('Please enter your string/password/API key: ')
response2 = getpass.getpass('Please enter the string/password/API key again: ')
hashed = hash.sha256_crypt.encrypt(response1)
if hash.sha256_crypt.verify(response2, hashed):
print('Put the hash in your configuration.yaml file.')
print(hashed)
else:
print('No match! Please try again.')