Title: [243716] trunk/Tools
- Revision
- 243716
- Author
- [email protected]
- Date
- 2019-04-01 14:57:13 -0700 (Mon, 01 Apr 2019)
Log Message
[ews-app] Use API_KEY to accept results data
https://bugs.webkit.org/show_bug.cgi?id=196461
Reviewed by Dewei Zhu.
* BuildSlaveSupport/ews-app/ews/views/results.py:
(Results.post): Validate EWS_API_KEY before accepting any data.
* BuildSlaveSupport/ews-build/events.py:
(Events.sendData): Send EWS_API_KEY if available along with event data.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py (243715 => 243716)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py 2019-04-01 21:50:02 UTC (rev 243715)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py 2019-04-01 21:57:13 UTC (rev 243716)
@@ -24,6 +24,7 @@
import json
import logging
+import os
from django.http import HttpResponse
from django.shortcuts import render
@@ -42,6 +43,10 @@
def post(self, request):
data = ""
+ if data.get('EWS_API_KEY') != os.getenv('EWS_API_KEY', None):
+ _log.error('Incorrect API Key {}. Host: {}. Ignoring data.'.format(data.get('EWS_API_KEY'), data.get('hostname')))
+ return HttpResponse('Incorrect API Key received')
+
if data.get('type') == u'ews-build':
return self.build_event(data)
Modified: trunk/Tools/BuildSlaveSupport/ews-build/events.py (243715 => 243716)
--- trunk/Tools/BuildSlaveSupport/ews-build/events.py 2019-04-01 21:50:02 UTC (rev 243715)
+++ trunk/Tools/BuildSlaveSupport/ews-build/events.py 2019-04-01 21:57:13 UTC (rev 243716)
@@ -22,6 +22,7 @@
import datetime
import json
+import os
import time
from buildbot.util import service
@@ -88,6 +89,8 @@
self.master_hostname = master_hostname
def sendData(self, data):
+ if os.getenv('EWS_API_KEY', None):
+ data['EWS_API_KEY'] = os.getenv('EWS_API_KEY')
agent = Agent(reactor)
body = JSONProducer(data)
Modified: trunk/Tools/ChangeLog (243715 => 243716)
--- trunk/Tools/ChangeLog 2019-04-01 21:50:02 UTC (rev 243715)
+++ trunk/Tools/ChangeLog 2019-04-01 21:57:13 UTC (rev 243716)
@@ -1,3 +1,15 @@
+2019-04-01 Aakash Jain <[email protected]>
+
+ [ews-app] Use API_KEY to accept results data
+ https://bugs.webkit.org/show_bug.cgi?id=196461
+
+ Reviewed by Dewei Zhu.
+
+ * BuildSlaveSupport/ews-app/ews/views/results.py:
+ (Results.post): Validate EWS_API_KEY before accepting any data.
+ * BuildSlaveSupport/ews-build/events.py:
+ (Events.sendData): Send EWS_API_KEY if available along with event data.
+
2019-04-01 Wenson Hsieh <[email protected]>
Unable to copy and paste a PDF from Notes into Mail compose body
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
