DevTools: respond with error when Debugger command is sent to disabled debugger agent

Source/core/inspector/InspectorDOMDebuggerAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 128 matching lines @@
 {
     if (m_domAgent->enabled() && m_debuggerAgent->enabled())
         m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
 }
 
 void InspectorDOMDebuggerAgent::domAgentWasDisabled()
 {
     disable(nullptr);
 }
 
+bool InspectorDOMDebuggerAgent::checkEnabled(ErrorString* errorString)
+{
+    if (!m_domAgent->enabled()) {
+        *errorString = "DOM domain required by DOMDebugger is not enabled";
+        return false;
+    }
+    if (!m_debuggerAgent->enabled()) {
+        *errorString = "Debugger domain required by DOMDebugger is not enabled";
+        return false;
+    }
+    return true;
+}
+
 void InspectorDOMDebuggerAgent::disable(ErrorString*)
 {
     m_instrumentingAgents->setInspectorDOMDebuggerAgent(nullptr);
     clear();
 }
 
 void InspectorDOMDebuggerAgent::discardAgent()
 {
     m_debuggerAgent->setListener(nullptr);
     m_debuggerAgent = nullptr;
@@ skipping 17 matching lines @@
     if (it != object->end())
         return it->value->asObject();
 
     RefPtr<JSONObject> result = JSONObject::create();
     object->setObject(propertyName, result);
     return result.release();
 }
 
 void InspectorDOMDebuggerAgent::setBreakpoint(ErrorString* error, const String& eventName, const String* targetName)
 {
+    if (!checkEnabled(error))
+        return;
     if (eventName.isEmpty()) {
         *error = "Event name is empty";
         return;
     }
 
-    // Backward compatibility. Some extensions expect that DOMDebuggerAgent is always enabled.
-    // See https://stackoverflow.com/questions/25764336/chrome-extension-domdebugger-api-does-not-work-anymore
-    if (!m_domAgent->enabled())
-        m_domAgent->enable(error);
-
-    if (error->length())
-        return;
-
     RefPtr<JSONObject> eventListenerBreakpoints = m_state->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
     RefPtr<JSONObject> breakpointsByTarget = ensurePropertyObject(eventListenerBreakpoints.get(), eventName);
     if (!targetName || targetName->isEmpty())
         breakpointsByTarget->setBoolean(DOMDebuggerAgentState::eventTargetAny, true);
     else
         breakpointsByTarget->setBoolean(targetName->lower(), true);
     m_state->setObject(DOMDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints.release());
 }
 
 void InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const String& eventName, const String* targetName)
@@ skipping 77 matching lines @@
     case SubtreeModified: return "subtree-modified";
     case AttributeModified: return "attribute-modified";
     case NodeRemoved: return "node-removed";
     default: break;
     }
     return "";
 }
 
 void InspectorDOMDebuggerAgent::setDOMBreakpoint(ErrorString* errorString, int nodeId, const String& typeString)
 {
+    if (!checkEnabled(errorString))
+        return;
     Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
 
     int type = domTypeForName(errorString, typeString);
     if (type == -1)
         return;
 
     uint32_t rootBit = 1 << type;
     m_domBreakpoints.set(node, m_domBreakpoints.get(node) | rootBit);
     if (rootBit & inheritableDOMBreakpointTypesMask) {
         for (Node* child = InspectorDOMAgent::innerFirstChild(node); child; child = InspectorDOMAgent::innerNextSibling(child))
             updateSubtreeBreakpoints(child, rootBit, true);
     }
 }
 
 void InspectorDOMDebuggerAgent::removeDOMBreakpoint(ErrorString* errorString, int nodeId, const String& typeString)
 {
+    if (!checkEnabled(errorString))
+        return;
     Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
     int type = domTypeForName(errorString, typeString);
     if (type == -1)
         return;
 
     uint32_t rootBit = 1 << type;
     uint32_t mask = m_domBreakpoints.get(node) & ~rootBit;
     if (mask)
@@ skipping 275 matching lines @@
 }
 
 void InspectorDOMDebuggerAgent::didFireWebGLErrorOrWarning(const String& message)
 {
     if (message.findIgnoringCase("error") != WTF::kNotFound)
         didFireWebGLError(String());
     else
         didFireWebGLWarning();
 }
 
-void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString*, const String& url)
+void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString* errorString, const String& url)
 {
+    if (!checkEnabled(errorString))
+        return;
     if (url.isEmpty()) {
         m_state->setBoolean(DOMDebuggerAgentState::pauseOnAllXHRs, true);
         return;
     }
 
     RefPtr<JSONObject> xhrBreakpoints = m_state->getObject(DOMDebuggerAgentState::xhrBreakpoints);
     xhrBreakpoints->setBoolean(url, true);
     m_state->setObject(DOMDebuggerAgentState::xhrBreakpoints, xhrBreakpoints.release());
 }
 
-void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
+void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString* errorString, const String& url)
 {
     if (url.isEmpty()) {
         m_state->setBoolean(DOMDebuggerAgentState::pauseOnAllXHRs, false);
         return;
     }
 
     RefPtr<JSONObject> xhrBreakpoints = m_state->getObject(DOMDebuggerAgentState::xhrBreakpoints);
     xhrBreakpoints->remove(url);
     m_state->setObject(DOMDebuggerAgentState::xhrBreakpoints, xhrBreakpoints.release());
 }
@@ skipping 21 matching lines @@
     eventData->setString("url", url);
     m_debuggerAgent->breakProgram(InspectorFrontend::Debugger::Reason::XHR, eventData.release());
 }
 
 void InspectorDOMDebuggerAgent::clear()
 {
     m_domBreakpoints.clear();
 }
 
 } // namespace blink