Merge remote-tracking branch 'upstream/master'

leticiawanderley · leticiawanderley · commit 474fe7b3b164 · 2017-04-05T11:10:43.000-03:00
diff --git a/comments.json b/comments.json
@@ -10,23 +10,19 @@
         "text": "React is *great*!"
     },
     {
-        "id": 1466760920344,
-        "author": "Leticia",
-        "text": "Test"
+        "id": 1464988635157,
+        "author": "ben",
+        "text": "*abc*"
     },
     {
-        "id": 1466762939294,
-        "author": "SDKJSLKGJ",
-        "text": "sjfklgjs"
+        "id": 1464988636500,
+        "author": "ben",
+        "text": "*abc*"
     },
     {
-        "id": 1466778761498,
-        "author": "dfgdg",
-        "text": "dafg"
-    },
-    {
-        "id": 1466778933070,
-        "author": "dghl",
-        "text": ";lkrg"
+        "id": 1464988717637,
+        "author": "evil",
+        "text": "<a href=\"javascript:alert(1)\">alert(1)</a>"
+>>>>>>> upstream/master
     }
 ]
diff --git a/public/index.html b/public/index.html
@@ -5,11 +5,11 @@
     <title>React Tutorial</title>
     <!-- Not present in the tutorial. Just for basic styling. -->
     <link rel="stylesheet" href="css/base.css" />
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.1.0/react.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.1.0/react-dom.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.6.16/browser.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.6.2/remarkable.min.js"></script>
+    <script src="https://unpkg.com/react@15.3.0/dist/react.js"></script>
+    <script src="https://unpkg.com/react-dom@15.3.0/dist/react-dom.js"></script>
+    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
+    <script src="https://unpkg.com/jquery@3.1.0/dist/jquery.min.js"></script>
+    <script src="https://unpkg.com/remarkable@1.7.1/dist/remarkable.min.js"></script>
   </head>
   <body>
     <div id="content"></div>
diff --git a/server.php b/server.php
@@ -27,11 +27,11 @@
 
 function routeRequest()
 {
-    $comments = file_get_contents('comments.json');
     $uri = $_SERVER['REQUEST_URI'];
     if ($uri == '/') {
         echo file_get_contents('./public/index.html');
     } elseif (preg_match('/\/api\/comments(\?.*)?/', $uri)) {
+        $comments = file_get_contents('comments.json');
         if($_SERVER['REQUEST_METHOD'] === 'POST') {
             $commentsDecoded = json_decode($comments, true);
             $commentsDecoded[] = [
diff --git a/server.py b/server.py
@@ -41,4 +41,4 @@ def comments_handler():
 
 
 if __name__ == '__main__':
-    app.run(port=int(os.environ.get("PORT", 3000)))
+    app.run(port=int(os.environ.get("PORT", 3000)), debug=True)

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@ def comments_handler():`
`41`	`41`
`42`	`42`
`43`	`43`	`if __name__ == '__main__':`
`44`		`- app.run(port=int(os.environ.get("PORT", 3000)))`
	`44`	`+ app.run(port=int(os.environ.get("PORT", 3000)), debug=True)`