haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-27 19:05:16 +00:00
Code Issues Releases Wiki Activity

Dns verify by dnspython (#6451)

Browse Source 
* update

* Update saml_config.py

* add debug logger

* Update saml_config.py
This commit is contained in:
Ranjiwei 2024-08-01 14:18:33 +08:00 committed by GitHub
parent 324c8bb628
commit 0ed71bbf85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -27,3 +27,4 @@ bleach==5.0.*
python-ldap==3.4.*
pypinyin==0.50.*
PyMuPDF==1.24.*
dnspython==2.1.*

38
seahub/organizations/api/admin/saml_config.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import uuid
import subprocess
import logging
import dns.resolver
from rest_framework import status
from rest_framework.views import APIView
@ -20,6 +20,19 @@ from seahub.organizations.models import OrgSAMLConfig
logger = logging.getLogger(__name__)
def query_dns_txt_record(domain):
try:
answers = dns.resolver.resolve(domain, 'TXT')
return None, "".join([a.to_text() for a in answers])
except dns.resolver.NoAnswer:
return True, api_error(status.HTTP_404_NOT_FOUND, 'No TXT record found for %s' % domain)
except dns.resolver.NXDOMAIN:
return True, api_error(status.HTTP_404_NOT_FOUND, '%s does not exist' % domain)
except Exception as e:
logger.exception(e)
return True, api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal Server Error.')
class OrgSAMLConfigView(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication)
@ -123,28 +136,15 @@ class OrgVerifyDomain(APIView):
error_msg = 'Cannot find dns_txt, please generate dns_txt first.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
proc = subprocess.Popen(["nslookup", "-type=TXT", domain], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
try:
stdout, stderr = proc.communicate(timeout=60)
except subprocess.TimeoutExpired:
proc.kill()
stdout, stderr = proc.communicate()
logger.error('Process execution timed out, stdout: %s, stderr: %s' % (stdout, stderr))
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal Server Error')
except Exception as e:
logger.error(e)
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal Server Error')
if stderr:
logger.error(stderr)
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal Server Error')
if saml_config.dns_txt in stdout.decode():
error, result = query_dns_txt_record(domain)
if error:
return result
if saml_config.dns_txt in result:
saml_config.domain_verified = True
saml_config.save()
return Response({'domain_verified': saml_config.domain_verified})
else:
logger.error(stdout)
logger.debug("DNS records: %s" % result)
error_msg = "Failed to verify domain ownership. Please make sure you have added " \
"the DNS TXT to your domain's DNS records and wait 5 minutes before trying again."
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)