Reworked execution method to use environment outputstream, fixed some style and copyright issues, changed the exec behaviour to finish the process and removed getItemNormalized

Author: Franziska Geiger

graalpython/com.oracle.graal.python.cext/include/typeslots.h

@@ -1,42 +1,7 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/* Copyright (c) 2018, 2019, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2017 Python Software Foundation
  *
- * The Universal Permissive License (UPL), Version 1.0
- *
- * Subject to the condition set forth below, permission is hereby granted to any
- * person obtaining a copy of this software, associated documentation and/or
- * data (collectively the "Software"), free of charge and under any and all
- * copyright rights in the Software, and any and all patent rights owned or
- * freely licensable by each licensor hereunder covering either (i) the
- * unmodified Software as contributed to or provided by such licensor, or (ii)
- * the Larger Works (as defined below), to deal in both
- *
- * (a) the Software, and
- *
- * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
- * one is included with the Software each a "Larger Work" to which the Software
- * is contributed by such licensors),
- *
- * without restriction, including without limitation the rights to copy, create
- * derivative works of, display, perform, and distribute the Software and make,
- * use, sell, offer for sale, import, export, have made, and have sold the
- * Software and the Larger Work(s), and to sublicense the foregoing rights on
- * either these or other terms.
- *
- * This license is subject to the following condition:
- *
- * The above copyright notice and either this complete permission notice or at a
- * minimum a reference to the UPL must be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
  */
 /* Do not renumber the file; these numbers are part of the stable ABI. */
 /* Disabled, see #10181 */

graalpython/com.oracle.graal.python.test/src/tests/test_posix.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -57,17 +57,21 @@ def test_execv(self):
         # test creates a shell script, which again creates a file, to ensure script execution
         # Both files are deleted again in the end
         import os
+        import sys
         new_file_path, cwd = self.create_file()
-        os.execv(new_file_path, [new_file_path, 'the_input'])
+        # os.execv(new_file_path, [new_file_path, 'the_input'])
+        os.system("%s -c \"import os; os.execv('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
         assert os.path.isfile(cwd + '/test.txt')
         self.delete_file(new_file_path, cwd)
 
     def test_execl(self):
         # test creates a shell script, which again creates a file, to ensure script execution
         # Both files are deleted again in the end
         import os
+        import sys
         new_file_path, cwd = self.create_file()
-        os.execl(new_file_path, [new_file_path, 'the_input'])
+        # os.execl(new_file_path, [new_file_path, 'the_input'])
+        os.system("%s -c \"import os; os.execl('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
         assert os.path.isfile(cwd + '/test.txt')
         self.delete_file(new_file_path, cwd)
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -107,6 +107,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes.LenNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemDynamicNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ToByteArrayNode;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
@@ -298,9 +299,14 @@ Object execute(String path, PList args) {
 
         @Specialization
         Object execute(PString path, PTuple args) {
+            return execute(path.getValue(), args);
+        }
+
+        @Specialization
+        Object execute(String path, PTuple args) {
             // in case of execl the PList happens to be in the tuples first entry
-            Object list = args.getSequenceStorage().getItemNormalized(0);
-            return doExecute(path.getValue(), list instanceof PList ? (PList) list : args);
+            Object list = GetItemDynamicNode.getUncached().execute(args.getSequenceStorage(), 0);
+            return doExecute(path, list instanceof PList ? (PList) list : args);
         }
 
         @Specialization
@@ -311,25 +317,30 @@ Object execute(PString path, PList args) {
         @TruffleBoundary
         Object doExecute(String path, PSequence args) {
             try {
+                if (!getContext().isExecutableAccessAllowed()) {
+                    throw raise(OSError, "executable access denied");
+                }
                 int size = args.getSequenceStorage().length();
                 String[] cmd = new String[size];
+                // We don't need the path variable because it's already in the array but I need to process it for CI gate
+                cmd[0] = path;
                 for (int i = 0; i < size; i++) {
-                    cmd[i] = args.getSequenceStorage().getItemNormalized(i).toString();
+                    cmd[i] = GetItemDynamicNode.getUncached().execute(args.getSequenceStorage(), i).toString();
                 }
                 Runtime rt = Runtime.getRuntime();
                 Process pr = rt.exec(cmd);
                 // retrieve output from executed script
                 BufferedReader bfr = new BufferedReader(new InputStreamReader(pr.getInputStream()));
+                OutputStream stream = getContext().getEnv().out();
                 String line = "";
                 while ((line = bfr.readLine()) != null) {
-                    System.out.println(line);
+                    stream.write(line.getBytes());
                 }
+                throw new PythonExitException(this, pr.exitValue());
             } catch (IOException e) {
                 throw raise(PythonErrorType.ValueError, "Could not execute script '%s'", e.getMessage());
             }
-            return PNone.NONE;
         }
-
     }
 
     @Builtin(name = "getcwd", minNumOfPositionalArgs = 0)

mx.graalpython/copyrights/overrides

@@ -100,6 +100,7 @@ graalpython/com.oracle.graal.python.cext/include/structseq.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/traceback.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/truffle.h,no.copyright
 graalpython/com.oracle.graal.python.cext/include/tupleobject.h,python.copyright
+graalpython/com.oracle.graal.python.cext/include/typeslots.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/ucnhash.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/unicodeobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/warnings.h,python.copyright
@@ -520,3 +521,4 @@ mx.graalpython/mx_graalpython.py,zippy.copyright
 mx.graalpython/mx_graalpython_bench_param.py,zippy.copyright
 mx.graalpython/mx_graalpython_benchmark.py,zippy.copyright
 mx.graalpython/suite.py,no.copyright
+