Marown
/
libreCatastro
mirror of https://github.com/josejuanmartinez/libreCatastro.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds authentication

This commit is contained in:
josejuanmartinez 2020-02-19 22:02:25 +01:00
parent de03141e10
commit 01a31a071d
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librecatastro/domain/cadaster_entry/cadaster_entry.py
View File

@ -45,7 +45,8 @@ class CadasterEntry:
def to_elasticsearch(self):
""" Gets stored in elastic search """
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'])
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'],
http_auth=(config['elasticsearch-user'], config['elasticsearch-pass']))
res = None
try:
body = json.dumps(self.to_json(), cls=JSONEncoder,sort_keys=True,
@ -61,7 +62,8 @@ class CadasterEntry:
def from_elasticsearch(self):
""" Confirms for checking purposes that the entry has been stored in elastic search previously """
res = False
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'])
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'],
http_auth=(config['elasticsearch-user'], config['elasticsearch-pass']))
try:
query = '{"query":{"bool":{"must":[{"match":{"cadaster":"' + self.cadaster + '"}}],"must_not":[],"should":[]}},"from":0,"size":10,"sort":[],"aggs":{}}'
res = es.search(index=config['elasticsearch-index'], body=query)

2
src/settings.py
View File

@ -20,6 +20,8 @@ config = {
"sleep_dos_time": 300,
"width_px": 120,
"height_px": 120,
"elasticsearch-user": environ.get("ES_USER") if environ.get('ES_USER') is not None else '',
"elasticsearch-pass": environ.get("ES_PASS") if environ.get('ES_PASS') is not None else '',
"elasticsearch-host": environ.get('ES_HOST') if environ.get('ES_HOST') is not None else "localhost",
"elasticsearch-port": environ.get('ES_PORT') if environ.get('ES_PORT') is not None else "9200",
"servers_down_message_001": "Error 001: Cadastro server to get provinces and cities is down.\n"

9
src/utils/elasticsearch_utils.py
View File

@ -22,7 +22,8 @@ class ElasticSearchUtils:
Creates index in ElasticSearch
"""
ElasticSearchUtils.remove_index()
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'])
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'],
http_auth=(config['elasticsearch-user'], config['elasticsearch-pass']))
request_body = {
"settings": {
"number_of_shards": 5,
@ -85,7 +86,8 @@ class ElasticSearchUtils:
"""
Removes index from ElasticSearch
"""
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'])
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'],
http_auth=(config['elasticsearch-user'], config['elasticsearch-pass']))
logger.debug("Deleting 'cadaster' index...")
try:
res = es.indices.delete(index='cadaster', ignore=[400, 404])
@ -119,7 +121,8 @@ class ElasticSearchUtils:
"size":11,
"sort":[],
"aggs":{}}
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'])
es = Elasticsearch(hosts=[config['elasticsearch-host']], port=config['elasticsearch-port'],
http_auth=(config['elasticsearch-user'], config['elasticsearch-pass']))
try:
res = es.search(index=config['elasticsearch-index'], body=query)
hits = res['hits']['total']['value']