Read environment variables and trust level from shortcut #956

ImperatorS79 · 2019-06-02T08:13:23Z

This PR will also need a PR in phoenicis in the display/edit shortcut code.

However, I did not manage to send custom environment variable to the shortcut create method. The environmentVar variable is always undefined. I tried to send [[DXVK_HUD, 1], [COUCOU, 27]].

It aims to fix #869 .

Merge Phoenicis/Scripts:master into ImperatorS79/Scripts:master

updated Hearthstone (download application directly) (PhoenicisOrg#383)

Merge master

Merge recent commits

Merge master

Merge Master

Merge master

plata · 2019-06-03T16:44:46Z

Not completely sure where you are stuck, but the flow is like this:

https://github.com/PhoenicisOrg/phoenicis/blob/bd9af0cd71e4f7a2a111684603e51cd9ee8abe20/phoenicis-library/src/main/java/org/phoenicis/library/dto/ShortcutDTO.java#L155
https://github.com/PhoenicisOrg/phoenicis/blob/bd9af0cd71e4f7a2a111684603e51cd9ee8abe20/phoenicis-library/src/main/java/org/phoenicis/library/ShortcutManager.java#L78
https://github.com/PhoenicisOrg/phoenicis/blob/bd9af0cd71e4f7a2a111684603e51cd9ee8abe20/phoenicis-library/src/main/java/org/phoenicis/library/ShortcutRunner.java#L42
scripts/Engines/Wine/Shortcuts/Reader/script.js

Line 82 in 26bda82

ShortcutReader.prototype.of = function (shortcut) {
scripts/Engines/Wine/Shortcuts/Reader/script.js

Line 19 in 26bda82

this.run = function (userArguments) {

Does this help at all or did you know that already? Can you push an example where you try to set the environmentVar?

ImperatorS79 · 2019-06-03T17:53:35Z

When creating a shortcut from a script (using new WineShortcut) , I tried to send the environment variable to the create method, but inside the code of the create method the variable is still undefined.

plata · 2019-06-03T19:32:39Z

Have you tried to add some print outs to see where it gets lost?

ImperatorS79 · 2019-06-03T20:26:00Z

If I send the json object {DXVK_HUD: "1", COUCOU: "27"} directly to the function, it says it cannot parse value for DXVK_HUD :/.

plata · 2019-06-05T16:26:43Z

Does this also solve PhoenicisOrg/phoenicis#192 ?

ImperatorS79 · 2019-06-05T16:34:44Z

No, it does not ^^.

plata · 2019-06-05T16:36:56Z

Ok, I thought it might work to add "/usr/bin/ck-launch-session", "" as environment.

ImperatorS79 · 2019-06-05T16:40:01Z

That is not the way to solve the problem, you need to use xinit to start another x-server, and the line you are talking about is just a special thing to do on ubuntu before xinit.

And what you propose will not work due to the fact the code use envronment.put().

plata · 2019-06-07T15:30:29Z

Okok, was just a quick thought when looping over the open issues.

madoar · 2019-06-14T20:02:48Z

Engines/Wine/Engine/Implementation/script.js

        }

+        if (userData["trustLevel"] == "0x20000" && distribution == "staging") {
+            var runasArgs = org.apache.commons.lang.ArrayUtils.addAll(["/trustlevel:0x20000", executable], args);


This line is really ugly. Please split it in two:

const ArrayUtils = Java.type("org.apache.commons.lang.ArrayUtils"); const runAsArgs = ArrayUtils.addAll(["/trustlevel:0x20000", executable], args);

@plata @qparis @ImperatorS79 ideally we do this change for every usage of Java classes and move the const JavaClass = Java.type(...); parts to the beginning of the files directly beneath the includes.

IMHO, Ideally, we should avoid calling directly java objects and use beans whenever it is possible.
This would make the scripts more agnostic of the main application

I have just copied the few lines above ^^.

Isn't directly calling Java objects basically the same as using (Java) beans? Both are Java objects underneath with the only difference that beans do not require Java.type(...).

If we want to do this in a clean way we will need to remove any kind of Java objects/classes from the script repository and access JavaScript libraries instead. If we do this the only interaction between the Java side and the Script side would be through method invocations from the Java side.

I see two advantages of using beans:

It could be implemented in any language :) Basically it would just represent a method that gets a property from an application context map. It makes our scripts more portable and testable in a future.

Later, we can take advantage of it to add security feature. (I.e. block all access to classes outside phoenicis)

Not totally. I would prefer Native.type instead of Java.type. In addition, and more important than the naming in my point of view: When you allow guest classes, you may need to reimplement the universe to port your script. If we have a clear and managed set of Beans interface you have to implement, it is a lot easier.

If we don't use any kind of Java objects from inside the scripts, we can simply forbid access to all kinds of Java objects from inside the scripts. I believe this would lead to the best security, right?

Forbid acess to all kinds of Java objects, except beans that handle correctly the security (like filesystem access, etc...)

But I think it is something we could discuss about in another issue

Yes. Still for now I would prefer to move all Java class imports to the beginning of the script files. This also makes it easier for us to find the Java object usages later on, because they are all in one place.

Sounds fair

@ImperatorS79 can you please try

const runAsArgs = ["/trustlevel:0x20000", executable].concat(args)

alternatively? This will avoid the Java dependency totally.

Engines/Wine/QuickScript/Quick Script/script.js

madoar · 2019-06-22T09:19:52Z

@ImperatorS79 it seems like this PR needs to be rebased because of my changes done to the shortcut reader.

ImperatorS79 · 2019-06-22T10:07:22Z

I will wait for the quick script changes to be merged first.

plata · 2019-06-22T10:31:53Z

That's done.

ImperatorS79 · 2019-06-22T11:08:28Z

Seems to still work.

madoar · 2019-06-28T19:25:18Z

Engines/Wine/Engine/Implementation/script.js

+        if (userData["trustLevel"] == "0x20000" && distribution == "staging") {
+            const runAsArgs = ["/trustlevel:0x20000", executable].concat(args);
+            userData["trustLevel"] = "0"; //avoid infinite loop
+            return this.run("runas", runasArgs, workingDir, captureOutput, wait, userData);


runAsArgs

ImperatorS79 added 24 commits August 28, 2017 15:19

Merge pull request #1 from PhoenicisOrg/master

06ad52f

Merge Phoenicis/Scripts:master into ImperatorS79/Scripts:master

Update script.js

86fd07c

Merge pull request #2 from PhoenicisOrg/master

a6f232b

updated Hearthstone (download application directly) (PhoenicisOrg#383)

Merge pull request #3 from PhoenicisOrg/master

a80aa84

Merge master

Merge pull request #4 from PhoenicisOrg/master

6da4a59

Merge recent commits

Merge pull request #8 from PhoenicisOrg/master

4a11f65

Merge master

Merge pull request #9 from PhoenicisOrg/master

b2d5724

Merge master

Merge pull request #10 from PhoenicisOrg/master

b7d1f0f

Merge master

Merge pull request #11 from PhoenicisOrg/master

533df6e

Merge master

Merge pull request #12 from PhoenicisOrg/master

186e4ed

Merge master

Merge pull request #13 from PhoenicisOrg/master

99cf1db

Merge master

Merge pull request #15 from PhoenicisOrg/master

87999b4

Merge master

Merge pull request #16 from PhoenicisOrg/master

610b258

Merge master

Merge pull request #17 from PhoenicisOrg/master

ad2ea01

Merge master

Merge pull request #18 from PhoenicisOrg/master

2e53a22

Merge master

Merge pull request #20 from PhoenicisOrg/master

10f93ca

Merge master

Merge pull request #21 from PhoenicisOrg/master

ade899d

Merge master

Merge pull request #23 from PhoenicisOrg/master

db6e1b9

Merge Master

Merge pull request #26 from PhoenicisOrg/master

da1a517

Merge master

Merge pull request #28 from PhoenicisOrg/master

72863e6

Merge master

Read environment variable from shortcut

18e0e5c

Quick fix

8058290

Update script.js

961eccf

Update script.js

7c87903

ImperatorS79 added 2 commits June 3, 2019 22:23

Update script.js

c878720

Update script.js

6e382b7

Update script.js

9195fc4

This was referenced Jun 6, 2019

Update DXVK for nvidia GPU #982

Open

Add FiveM #914

Open

Allow to set the trust level in shortcut

378e447

ImperatorS79 changed the title ~~Read environment variable from shortcut~~ Read environment variables and trust level from shortcut Jun 7, 2019

ImperatorS79 added 4 commits June 7, 2019 19:55

Update script.js

d32c80f

Update script.js

6910d15

Update script.js

ef5d5aa

Merge branch 'master' into EnvVar

d73b32d

ImperatorS79 mentioned this pull request Jun 14, 2019

Refactor the ShortcutReader and WineShortcutReader Classes #1008

Merged

madoar requested changes Jun 14, 2019

View reviewed changes

madoar reviewed Jun 14, 2019

View reviewed changes

Engines/Wine/QuickScript/Quick Script/script.js Outdated Show resolved Hide resolved

ImperatorS79 added 2 commits June 22, 2019 12:50

Merge branch 'master' into EnvVar

e711e68

Update script.js

1b11ffd

ImperatorS79 added 2 commits June 25, 2019 12:40

Avoid calling java (still to test)

70bc744

Update script.js

011a023

madoar requested changes Jun 28, 2019

View reviewed changes

Update script.js

09d2f05

madoar approved these changes Jun 28, 2019

View reviewed changes

ImperatorS79 merged commit a1cb1a2 into PhoenicisOrg:master Jun 28, 2019

ImperatorS79 deleted the EnvVar branch August 24, 2019 16:33

Read environment variables and trust level from shortcut #956

Read environment variables and trust level from shortcut #956

Uh oh!

Conversation

ImperatorS79 commented Jun 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

plata commented Jun 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ImperatorS79 commented Jun 3, 2019

Uh oh!

plata commented Jun 3, 2019

Uh oh!

ImperatorS79 commented Jun 3, 2019

Uh oh!

plata commented Jun 5, 2019

Uh oh!

ImperatorS79 commented Jun 5, 2019

Uh oh!

plata commented Jun 5, 2019

Uh oh!

ImperatorS79 commented Jun 5, 2019

Uh oh!

plata commented Jun 7, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qparis Jun 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qparis Jun 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

madoar Jun 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

madoar commented Jun 22, 2019

Uh oh!

ImperatorS79 commented Jun 22, 2019

Uh oh!

plata commented Jun 22, 2019

Uh oh!

ImperatorS79 commented Jun 22, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ImperatorS79 commented Jun 2, 2019 •

edited

Loading

plata commented Jun 3, 2019 •

edited

Loading

qparis Jun 14, 2019 •

edited

Loading

qparis Jun 14, 2019 •

edited

Loading

madoar Jun 14, 2019 •

edited

Loading