Skip to content

L
Liman MYS - Çekirdek
Unverified Kaydet (Commit) 67d3a066 authored tarafından Mert ÇELEN's avatar Mert ÇELEN Kaydeden (comit) GitHub
Dosyalara gözat
Seçenekler

Merge pull request #68 from mertcelen/1-dev 

Fixes for dispatch job structure.
üst 0aa2a58d 1cfd5bec
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 89 deletions
app/Classes/Sandbox/PHPSandbox.php
Dosyayı görüntüle @ 67d3a066
......@@ -11,6 +11,21 @@ class PHPSandbox implements Sandbox
{
private $path = "/liman/sandbox/php/index.php";
private $fileExtension = ".blade.php";
private $server,$extension,$user,$request;
public function __construct($server = null, $extension = null, $user = null,$request = null)
{
$this->server = ($server) ? $server : server();
$this->extension = ($extension) ? $extension : extension();
$this->user = ($user) ? $user : user();
$this->request = ($request) ? $request : request()->except([
"permissions",
"extension",
"server",
"script",
"server_id",
]);
}
public function getPath()
{
......@@ -27,17 +42,17 @@ class PHPSandbox implements Sandbox
$combinerFile = $this->path;
$settings = UserSettings::where([
"user_id" => user()->id,
"server_id" => server()->id,
"user_id" => $this->user->id,
"server_id" => $this->server->id,
]);
if ($extensionDb == null) {
$extensionDb = [];
foreach ($settings->get() as $setting) {
$key =
env('APP_KEY') .
user()->id .
extension()->id .
server()->id;
$this->user->id .
$this->extension->id .
$this->server->id;
$decrypted = openssl_decrypt(
$setting->value,
'aes-256-cfb8',
......@@ -50,34 +65,27 @@ class PHPSandbox implements Sandbox
$extensionDb = json_encode($extensionDb);
}
$request = request()->except([
"permissions",
"extension",
"server",
"script",
"server_id",
]);
$request = json_encode($request);
$request = json_encode($this->request);
$apiRoute = route('extension_server', [
"extension_id" => extension()->id,
"city" => server()->city,
"server_id" => server()->id,
"extension_id" => $this->extension->id,
"city" => $this->server->city,
"server_id" => $this->server->id,
]);
$navigationRoute = route('extension_server', [
"server_id" => server()->id,
"extension_id" => extension()->id,
"city" => server()->city,
"server_id" => $this->server->id,
"extension_id" => $this->extension->id,
"city" => $this->server->city,
]);
$token = Token::create(user()->id);
$token = Token::create($this->user->id);
if (!user()->isAdmin()) {
if (!$this->user->isAdmin()) {
$extensionJson = json_decode(
file_get_contents(
"/liman/extensions/" .
strtolower(extension()->name) .
strtolower($this->extension->name) .
DIRECTORY_SEPARATOR .
"db.json"
),
......@@ -88,10 +96,10 @@ class PHPSandbox implements Sandbox
foreach ($extensionJson["functions"] as $item) {
if (
Permission::can(
user()->id,
$this->user->id,
"function",
"name",
strtolower(extension()->name),
strtolower($this->extension->name),
$item["name"]
) ||
$item["isActive"] != "true"
......@@ -106,18 +114,18 @@ class PHPSandbox implements Sandbox
}
$userData = [
"id" => user()->id,
"name" => user()->name,
"email" => user()->email,
"id" => $this->user->id,
"name" => $this->user->name,
"email" => $this->user->email,
];
$functionsPath =
"/liman/extensions/" .
strtolower(extension()->name) .
strtolower($this->extension->name) .
"/views/functions.php";
$publicPath = route('extension_public_folder', [
"extension_id" => extension()->id,
"extension_id" => $this->extension->id,
"path" => "",
]);
......@@ -125,8 +133,8 @@ class PHPSandbox implements Sandbox
$array = [
$functionsPath,
$function,
server()->toArray(),
extension()->toArray(),
$this->server->toArray(),
$this->extension->toArray(),
$extensionDb,
$request,
$apiRoute,
......@@ -146,19 +154,19 @@ class PHPSandbox implements Sandbox
'cat ' .
'/liman/keys' .
DIRECTORY_SEPARATOR .
extension()->id
$this->extension->id
),
0,
Str::random()
);
$keyPath = '/liman/keys' . DIRECTORY_SEPARATOR . extension()->id;
$keyPath = '/liman/keys' . DIRECTORY_SEPARATOR . $this->extension->id;
$soPath = "/liman/extensions/" . strtolower(extension()->name) . "/liman.so";
$soPath = "/liman/extensions/" . strtolower($this->extension->name) . "/liman.so";
$extra = is_file($soPath) ? "-dextension=$soPath ": "";
return "sudo runuser " .
cleanDash(extension()->id) .
cleanDash($this->extension->id) .
" -c 'timeout 30 /usr/bin/php $extra-d display_errors=on $combinerFile $keyPath $encrypted'";
}
......
app/Classes/Sandbox/PythonSandbox.php
Dosyayı görüntüle @ 67d3a066
......@@ -11,6 +11,21 @@ class PythonSandbox implements Sandbox
{
private $path = "/liman/sandbox/python/index.py";
private $fileExtension = ".html.ninja";
private $server,$extension,$user,$request;
public function __construct($server = null, $extension = null, $user = null,$request = null)
{
$this->server = ($server) ? $server : server();
$this->extension = ($extension) ? $extension : extension();
$this->user = ($user) ? $user : user();
$this->request = ($request) ? $request : request()->except([
"permissions",
"extension",
"server",
"script",
"server_id",
]);
}
public function getPath()
{
......@@ -27,13 +42,13 @@ class PythonSandbox implements Sandbox
$combinerFile = $this->path;
$settings = UserSettings::where([
"user_id" => user()->id,
"server_id" => server()->id,
"user_id" => $this->user->id,
"server_id" => $this->server->id,
]);
$extensionDb = [];
foreach ($settings->get() as $setting) {
$key = env('APP_KEY') . user()->id . extension()->id . server()->id;
$key = env('APP_KEY') . $this->user->id . $this->extension->id . $this->server->id;
$decrypted = openssl_decrypt($setting->value, 'aes-256-cfb8', $key);
$stringToDecode = substr($decrypted, 16);
$extensionDb[$setting->name] = base64_decode($stringToDecode);
......@@ -41,34 +56,27 @@ class PythonSandbox implements Sandbox
$extensionDb = json_encode($extensionDb);
$request = request()->except([
"permissions",
"extension",
"server",
"script",
"server_id",
]);
$request = json_encode($request);
$request = json_encode($this->request);
$apiRoute = route('extension_server', [
"extension_id" => extension()->id,
"city" => server()->city,
"server_id" => server()->id,
"extension_id" => $this->extension->id,
"city" => $this->server->city,
"server_id" => $this->server->id,
]);
$navigationRoute = route('extension_server', [
"server_id" => server()->id,
"extension_id" => extension()->id,
"city" => server()->city,
"server_id" => $this->server->id,
"extension_id" => $this->extension->id,
"city" => $this->server->city,
]);
$token = Token::create(user()->id);
$token = Token::create($this->user->id);
if (!user()->isAdmin()) {
if (!$this->user->isAdmin()) {
$extensionJson = json_decode(
file_get_contents(
"/liman/extensions/" .
strtolower(extension()->name) .
strtolower($this->extension->name) .
DIRECTORY_SEPARATOR .
"db.json"
),
......@@ -79,10 +87,10 @@ class PythonSandbox implements Sandbox
foreach ($extensionJson["functions"] as $item) {
if (
Permission::can(
user()->id,
$this->user->id,
"function",
"name",
strtolower(extension()->name),
strtolower($this->extension->name),
$item["name"]
) ||
$item["isActive"] != "true"
......@@ -97,18 +105,18 @@ class PythonSandbox implements Sandbox
}
$userData = [
"id" => user()->id,
"name" => user()->name,
"email" => user()->email,
"id" => $this->user->id,
"name" => $this->user->name,
"email" => $this->user->email,
];
$functionsPath =
"/liman/extensions/" .
strtolower(extension()->name) .
strtolower($this->extension->name) .
"/views/functions.py";
$publicPath = route('extension_public_folder', [
"extension_id" => extension()->id,
"extension_id" => $this->extension->id,
"path" => "",
]);
......@@ -116,8 +124,8 @@ class PythonSandbox implements Sandbox
$array = [
$functionsPath,
$function,
server()->toArray(),
extension()->toArray(),
$this->server->toArray(),
$this->extension->toArray(),
$extensionDb,
$request,
$apiRoute,
......@@ -130,14 +138,14 @@ class PythonSandbox implements Sandbox
$isAjax,
];
$keyPath = '/liman/keys' . DIRECTORY_SEPARATOR . extension()->id;
$keyPath = '/liman/keys' . DIRECTORY_SEPARATOR . $this->extension->id;
$combinerFile =
"/liman/extensions/" .
strtolower(extension()->name) .
strtolower($this->extension->name) .
"/views/functions.py";
$encrypted = base64_encode(json_encode($array));
return "sudo -u " .
cleanDash(extension()->id) .
cleanDash($this->extension->id) .
" bash -c 'export PYTHONPATH=\$PYTHONPATH:/liman/sandbox/python; timeout 30 /usr/bin/python3 $combinerFile $keyPath $encrypted 2>&1'";
}
......
app/Classes/Sandbox/Sandbox.php
Dosyayı görüntüle @ 67d3a066
......@@ -4,6 +4,8 @@ namespace App\Classes\Sandbox;
interface Sandbox
{
public function __construct($server = null, $extension = null, $user = null,$request = null);
public function getPath();
public function getFileExtension();
......
app/Http/Controllers/Extension/Sandbox/InternalController.php
Dosyayı görüntüle @ 67d3a066
......@@ -12,7 +12,7 @@ use App\Permission;
use App\Server;
use App\ServerLog;
use App\Token;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
......
app/Http/Controllers/Extension/Sandbox/MainController.php
Dosyayı görüntüle @ 67d3a066
......@@ -58,7 +58,7 @@ class MainController extends Controller
system_log(7, "EXTENSION_RENDER_PAGE", [
"extension_id" => extension()->id,
"server_id" => server()->id,
"view" => "",
"view" => $page,
]);
if (trim($output) == "") {
abort(504, "İstek zaman aşımına uğradı!");
......
app/Jobs/ExtensionJob.php
Dosyayı görüntüle @ 67d3a066
......@@ -24,6 +24,7 @@ class ExtensionJob implements ShouldQueue
$request,
$session,
$cookie,
$sandbox,
$history;
/**
......@@ -46,9 +47,10 @@ class ExtensionJob implements ShouldQueue
$this->function = $function;
$this->parameters = $parameters;
$this->session = session()->all();
$this->cookie = isset($_COOKIE["liman_session"])
? $_COOKIE["liman_session"]
: '';
foreach ($parameters as $key => $param) {
request()->request->add([$key => $param]);
}
$this->sandbox = sandbox();
}
/**
......@@ -58,22 +60,10 @@ class ExtensionJob implements ShouldQueue
*/
public function handle()
{
$request = [];
$parameters = json_decode($this->parameters);
foreach ($parameters as $key => $param) {
$request[$key] = $param;
}
$this->request = $request;
$command = self::sandbox(
$this->server,
$this->extension,
$this->extension->id,
$this->user->id,
"null",
"null",
$this->function
);
$command = $this->sandbox->command($this->function);
$output = shell_exec($command);
system_log(7, "EXTENSION_BACKGROUND_RUN", [
"extension_id" => $this->extension->id,
"server_id" => $this->server->id,
......
storage/VERSION
Dosyayı görüntüle @ 67d3a066
1.0.4
\ No newline at end of file
1.0.5
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment