Merge pull request #2499 from deniszh/DZ-no-send-email

Removing  function 'send_email'

Author: DanCech

webapp/graphite/composer/urls.py

@@ -16,7 +16,6 @@
 from . import views
 
 urlpatterns = [
-    url(r'^/send_email', views.send_email, name='composer_send_email'),
     url(r'^/mygraph', views.mygraph, name='composer_mygraph'),
     url(r'^/?$', views.composer, name='composer'),
 ]

webapp/graphite/composer/views.py

@@ -13,15 +13,6 @@
 limitations under the License."""
 
 import os
-from smtplib import SMTP
-from socket import gethostname
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.mime.image import MIMEImage
-from six.moves.http_client import HTTPConnection
-from six.moves.urllib.parse import urlsplit
-from time import ctime, strftime
-from traceback import format_exc
 from graphite.user_util import getProfile
 from graphite.logger import log
 from graphite.account.models import MyGraph
@@ -90,35 +81,3 @@ def mygraph(request):
 
   else:
     return HttpResponse("Invalid operation '%s'" % action)
-
-
-def send_email(request):
-  try:
-    recipients = request.GET['to'].split(',')
-    url = request.GET['url']
-    proto, server, path, query, frag = urlsplit(url)
-    if query: path += '?' + query
-    conn = HTTPConnection(server)
-    conn.request('GET',path)
-    try: # Python 2.7+, use buffering of HTTP responses
-      resp = conn.getresponse(buffering=True)
-    except TypeError:  # Python 2.6 and older
-      resp = conn.getresponse()
-    assert resp.status == 200, "Failed HTTP response %s %s" % (resp.status, resp.reason)
-    rawData = resp.read()
-    conn.close()
-    message = MIMEMultipart()
-    message['Subject'] = "Graphite Image"
-    message['To'] = ', '.join(recipients)
-    message['From'] = 'composer@%s' % gethostname()
-    text = MIMEText( "Image generated by the following graphite URL at %s\r\n\r\n%s" % (ctime(),url) )
-    image = MIMEImage( rawData )
-    image.add_header('Content-Disposition', 'attachment', filename="composer_" + strftime("%b%d_%I%M%p.png"))
-    message.attach(text)
-    message.attach(image)
-    s = SMTP(settings.SMTP_SERVER)
-    s.sendmail('composer@%s' % gethostname(),recipients,message.as_string())
-    s.quit()
-    return HttpResponse( "OK" )
-  except Exception:
-    return HttpResponse(format_exc())

webapp/graphite/settings.py

@@ -124,7 +124,6 @@
 REMOTE_RENDER_CONNECT_TIMEOUT = 1.0
 
 #Miscellaneous settings
-SMTP_SERVER = "localhost"
 DOCUMENTATION_VERSION = 'latest' if 'dev' in WEBAPP_VERSION else WEBAPP_VERSION
 DOCUMENTATION_URL = 'https://graphite.readthedocs.io/en/{}/'.format(DOCUMENTATION_VERSION)
 ALLOW_ANONYMOUS_CLI = True