Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix) #104

F9Alejandro · 2018-09-11T23:50:29Z

Updated single commit to better track/organize for pulling.

libpius/path.py handles pathing of the local machine and determines what to use or do based on the host OS.

set_tmpdir() is hard coded for Mac (Darwin) and linux as $TMPDIR doesn't respond correctly or is not an env variable in varying versions.

(Note: MacOS uses mktemp which is not able to be accessed by anyone* except the user, some versions of linux use $TMP/$TEMP/$TMPDIR/$TEMPDIR or just doesn't exist at all)
*includes root

* Dropping cached passphrased * Dropping interactive mode * Dropping gpg1 support

… path.py as a linpius util.

libpius/path.py

F9Alejandro · 2018-09-12T09:02:36Z

Changes made has been tested on Mac, Linux, and Windows. pius.spec needs to have cross compatibility for other OSes, or multi stage depending on the platform run a different set of instructions.

jaymzh

Thanks for putting effort into the Windows stuff... definitely not something I have done. :) Appreciated.

libpius/path.py

pius-keyring-mgr

Fixed capitals for non constants. and made variable names more clear for others.

added default linux tempdir path as constant

Decided on Constant being in the path file.

Decided against having tempdir path being in this file.

updated function names and added import for some constants, also provided a check to see if the platform is windows or linux, if windows then do a normal which search, if linux then use the path constant with normal path separators to see if it exists with the other bin files.

fixed function names to reflect the changes in the paths file

due to calling path in constants.py LINUX_TEMPDIR and BIN_PATHS need to be in this file as it will cause a import loop between this file and constants.py

Fixed variable name not being complete, and changed hard code of existing hard code constant.

fixed function names to reflect previous changes

fixed oversight. %APPDATA% places user in their roaming folder, no need to have it as part of path join as it is already in the home variable.

Removed unused import

libpius/path.py

jaymzh · 2018-09-21T11:42:58Z

I see I hadn't been very clear on some of my comments before - my apologies. Please don't hesitate to ask for further clarification on anything else. Thanks again for improving the experience for non-Linux users!

removed old comment from EOF. removed elif statement from incorrect spot.

added back a previously deleted function. added 2 checks to pius home on linux/unix systems.

F9Alejandro · 2018-09-23T15:28:30Z

Remember that windows __does not__ use the same structure tree as Linux there is no such thing as /usr in windows. If you want it removed then you can freely do so give me a few minutes and I will add you as a maintainer/contributor on my git repo Sent from my T-Mobile 4G LTE Device -------- Original message --------From: Phil Dibowitz <[email protected]> Date: 9/23/18 00:38 (GMT-05:00) To: jaymzh/pius <[email protected]> Cc: Alexander Featherson <[email protected]>, Author <[email protected]> Subject: Re: [jaymzh/pius] Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix) (#104) @jaymzh commented on this pull request. In libpius/path.py:

@@ -0,0 +1,124 @@

+'''A set of path functions and variables for the PIUS suite.''' +from __future__ import print_function + +import os +import sys +import stat +from os.path import abspath +import fnmatch + +LINUX_TEMPDIR = '/tmp/' +BIN_PATHS = '/usr/bin;/usr/sbin/;/bin;/sbin;/usr/local/bin;/usr/local/sbin' No distribution installs software into /usr/local - that's now how FSB works. /usr/local is where user-compiled software goes, which is not where we'd expect security-sensitive software like GPG to be on a Linux machine. We should not look in /usr/local by default on windows unless to user asks us to. Remember the user can do so with a config file by adding gpg-path=/usr/local/bin/gpg to their .piusrc. That's why we have a config file for anyone with a non-standard configuration. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or mute the thread.

Seperated MacOS and Linux binary paths Mac check joins mac and linux binary paths

F9Alejandro · 2018-09-25T21:15:11Z

Latest commit should fix the last of your major concerns, push come to shove i could make it more narrowed down to just Cellar (Homebrew) and MacGPG2 (GPG Tools suite)

libpius/path.py

Additional fixes to issues that have not been caught previously.

libpius/path.py

Change ; to :

Fixed ordering of files to be checked for.

New function to find current piusrc

fixed some typos in nested if statement. added new function to get piusrc and check if the home for pius is a directory or a file.

F9Alejandro · 2018-09-26T22:01:24Z

Resolved the issue about order of pius home checks in turn also fixing a hard coded path that should be checked if it is a dir or not.

jaymzh · 2019-02-08T07:36:33Z

libpius/path.py

+        gpg = which('gpg2')
+    elif sys.platform == "darwin":
+        #joining all possible paths for location of mac binaries
+        BIN_PATHS = MAC_BIN_PATHS+":"+LINUX_BIN_PATHS)


trailing ) here...

jaymzh · 2019-02-08T07:38:49Z

libpius/path.py

+        if os.path.exists(os.path.join(usrhome, '.pius')) and os.access(os.path.join(usrhome,'.pius'), mode) and os.path.isdir(os.path.join(usrhome,'.pius')):
+            piushome = os.path.join(usrhome,'.pius')
+        elif os.path.exists(os.path.join(usrhome, '.piusrc')) and os.access(os.path.join(usrhome,'.piusrc'), mode) and os.path.isdir(os.path.join(usrhome,'.piusrc')):
+            piushome = os.path.join(usrhome,'.piusrc')


.piusrc was never a dir, it was always a file.

jaymzh · 2019-02-08T07:40:29Z

libpius/path.py

+        #fall back if above is not applicable
+        else:
+            piushome = os.path.join(usrhome, '.pius')
+        return piushome


this method returns a dir in the if, a file in the first elif, a dir in the second, a dir in the third. and a file in the else

jaymzh · 2019-02-08T07:41:49Z

libpius/path.py

+
+def get_piusrc(path):
+    if sys.platform == "win32":
+        if os.path.islink(path) and not os.path.isfile(path):


should this be and os.path.isdir(path)?

jaymzh · 2019-02-08T07:42:27Z

libpius/path.py

+    if sys.platform == "win32":
+        if os.path.islink(path) and not os.path.isfile(path):
+            return os.path.join(path, 'piusrc')
+        elif os.path.isfile(path) and not os.path.islink(path):


if it's not a file and not a link, then... it's a ... file?

jaymzh · 2019-02-08T07:43:34Z

libpius/path.py

+
+def get_tmpdir(dir):
+    if sys.platform == "win32":
+        tempdir = os.environ.get('TEMP')


what if that's not defined?

jaymzh · 2019-02-08T07:43:45Z

libpius/path.py

+        if os.environ.get('USER') == "root":
+            tempdir = '/private/tmp/'
+        else:
+            tempdir = os.environ.get('TMPDIR')


jaymzh and others added 3 commits May 17, 2018 08:57

3.0 work: Remove gpg1 and related support

a480b54

* Dropping cached passphrased * Dropping interactive mode * Dropping gpg1 support

Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix).…

125d626

… path.py as a linpius util.

Experimental test of environ.get for Linux

d4fb284

F9Alejandro commented Sep 12, 2018

View reviewed changes

libpius/path.py Outdated Show resolved Hide resolved

F9Alejandro commented Sep 12, 2018

View reviewed changes

libpius/path.py Outdated Show resolved Hide resolved

F9Alejandro commented Sep 12, 2018

View reviewed changes

libpius/path.py Outdated Show resolved Hide resolved

jaymzh requested changes Sep 21, 2018

View reviewed changes

F9Alejandro added 11 commits September 21, 2018 03:25

Update path.py

bcc3329

Fixed capitals for non constants. and made variable names more clear for others.

Update constants.py

e302a9c

added default linux tempdir path as constant

Update path.py

21bde5d

Decided on Constant being in the path file.

Update constants.py

17a4d2a

Decided against having tempdir path being in this file.

Update constants.py

551244e

fixed function names to reflect the changes in the paths file

Update path.py

49eca51

due to calling path in constants.py LINUX_TEMPDIR and BIN_PATHS need to be in this file as it will cause a import loop between this file and constants.py

Update path.py

5748b5f

Fixed variable name not being complete, and changed hard code of existing hard code constant.

Update pius-keyring-mgr

6d61630

fixed function names to reflect previous changes

Update path.py

b81975b

fixed oversight. %APPDATA% places user in their roaming folder, no need to have it as part of path join as it is already in the home variable.

Update path.py

41b9bf6

Removed unused import

jaymzh requested changes Sep 21, 2018

View reviewed changes

libpius/path.py Outdated Show resolved Hide resolved

libpius/path.py Outdated Show resolved Hide resolved

libpius/path.py Show resolved Hide resolved

libpius/path.py Outdated Show resolved Hide resolved

F9Alejandro added 2 commits September 21, 2018 16:05

Update path.py

7b3b695

removed old comment from EOF. removed elif statement from incorrect spot.

Update path.py

006b1df

added back a previously deleted function. added 2 checks to pius home on linux/unix systems.

Update path.py

16b9212

Seperated MacOS and Linux binary paths Mac check joins mac and linux binary paths

F9Alejandro mentioned this pull request Sep 25, 2018

Support XDG_CONFIG_HOME request #99

Closed

jaymzh requested changes Sep 26, 2018

View reviewed changes

Update path.py

44e1213

Additional fixes to issues that have not been caught previously.

jaymzh reviewed Sep 26, 2018

View reviewed changes

libpius/path.py Outdated Show resolved Hide resolved

F9Alejandro added 4 commits September 26, 2018 12:06

Update path.py

1413fd6

Change ; to :

Update path.py

dc39067

Fixed ordering of files to be checked for.

Update constants.py

4671934

New function to find current piusrc

Update path.py

5c1edb2

fixed some typos in nested if statement. added new function to get piusrc and check if the home for pius is a directory or a file.

jaymzh force-pushed the 3_work branch from a8516c4 to aed4bed Compare February 7, 2019 18:51

jaymzh requested changes Feb 8, 2019

View reviewed changes

jaymzh added the waitingonsubmitter Waiting on the sbumitter label Jun 28, 2019

jaymzh force-pushed the 3_work branch from bd2cb64 to 0ffca0d Compare June 28, 2019 15:56

jaymzh closed this Jul 5, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix) #104

Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix) #104

F9Alejandro commented Sep 11, 2018

F9Alejandro commented Sep 12, 2018

jaymzh left a comment

jaymzh commented Sep 21, 2018

F9Alejandro commented Sep 23, 2018 via email

F9Alejandro commented Sep 25, 2018

F9Alejandro commented Sep 26, 2018

jaymzh Feb 8, 2019

jaymzh Feb 8, 2019

jaymzh Feb 8, 2019

jaymzh Feb 8, 2019

jaymzh Feb 8, 2019

jaymzh Feb 8, 2019

jaymzh Feb 8, 2019

Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix) #104

Fixed pathing for OSes (GPG, TMP, Home, etc. for Windows/Linux/Unix) #104

Conversation

F9Alejandro commented Sep 11, 2018

F9Alejandro commented Sep 12, 2018

jaymzh left a comment

Choose a reason for hiding this comment

jaymzh commented Sep 21, 2018

F9Alejandro commented Sep 23, 2018 via email

F9Alejandro commented Sep 25, 2018

F9Alejandro commented Sep 26, 2018

jaymzh Feb 8, 2019

Choose a reason for hiding this comment

jaymzh Feb 8, 2019

Choose a reason for hiding this comment

jaymzh Feb 8, 2019

Choose a reason for hiding this comment

jaymzh Feb 8, 2019

Choose a reason for hiding this comment

jaymzh Feb 8, 2019

Choose a reason for hiding this comment

jaymzh Feb 8, 2019

Choose a reason for hiding this comment

jaymzh Feb 8, 2019

Choose a reason for hiding this comment