Add optional state file permissions #2238

sthirugn · 2020-04-27T20:46:20Z

Description

Before this commit, it was possible that the puma.state file would be world-readable which may not be desirable in production environments. This introduces a new optional configuration option to set desired state file permissions.

Your checklist for this pull request

I have reviewed the guidelines for contributing to this repository.
I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] the pull request title.
I have added appropriate tests if this PR fixes a bug or adds a feature.
My pull request is 100 lines added/removed or less so that it can be easily reviewed.
If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
I have updated the documentation accordingly.
All new and existing tests passed, including Rubocop.

# bundle exec rake test:all
<snip>
# Running:
....................................................................................................................................S.....................S.....S.....S..........................................................................................................................................................S........

Fabulous run in 115.014845s, 2.8692 runs/s, 7.3643 assertions/s.

330 runs, 847 assertions, 0 failures, 0 errors, 5 skips

You have skipped tests. Run with --verbose for details.

------------------------------------------------------------ Debugging Info
TestIntegrationCluster#test_term_closes_listeners_tcp
    10 successes, 5 resets, 25 refused, failures 0
TestIntegrationCluster#test_term_closes_listeners_unix
    10 successes, 0 resets, 30 refused, failures 0
---------------------------------------------------------------------------

ruby test/shell/run.rb
curl: (7) Failed to connect to localhost port 10102: Connection refused
Puma starting in single mode...
* Version 4.3.3 (ruby 2.7.0-p0), codename: Mysterious Traveller
* Min threads: 0, max threads: 5
* Environment: development
* Listening on tcp://0.0.0.0:10102
Use Ctrl-C to stop
Hello Worldcurl: (7) Failed to connect to localhost port 10103: Connection refused
Puma starting in single mode...
* Version 4.3.3 (ruby 2.7.0-p0), codename: Mysterious Traveller
* Min threads: 0, max threads: 5
* Environment: development
* Listening on tcp://0.0.0.0:10103
Use Ctrl-C to stop
Hello WorldCommand stop sent success
[440153] Puma starting in cluster mode...
[440153] * Version 4.3.3 (ruby 2.7.0-p0), codename: Mysterious Traveller
[440153] * Min threads: 0, max threads: 5
[440153] * Environment: development
[440153] * Process workers: 3
[440153] * Phased restart available
[440153] * Listening on tcp://0.0.0.0:10102
[440153] Use Ctrl-C to stop
[440153] - Worker 0 (pid: 440155) booted, phase: 0
[440153] - Worker 1 (pid: 440156) booted, phase: 0
[440153] - Worker 2 (pid: 440158) booted, phase: 0
[440153] - Worker 2 (pid: 440178) booted, phase: 0
[440153] - Gracefully shutting down workers...
</snip>

dentarg · 2020-04-27T21:17:45Z

Should we add a test for this?

History.md

sthirugn · 2020-04-27T22:00:56Z

Should we add a test for this?

I wanted to write a test and searched for tests related to state_path so I can extend them for permission. But I don't find any tests for state_path. If you know, can you point me to state_path tests so I can extend it for the permissions?

lib/puma/dsl.rb

nateberkopec · 2020-04-27T23:12:22Z

History.md

@@ -49,6 +49,9 @@
  * JSON parse cluster worker stats instead of regex (#2124)
  * Support parallel tests in verbose progress reporting (#2223)

+* Security
+  * New configuration option to set state file permissions (#2238)


I think this can be added under "features" rather than a new section

nateberkopec · 2020-04-27T23:13:21Z

It's possible there are no tests for state_path. You don't have to write tests for that, but we do need tests for this.

What's the current file permissions of a created statefile today?

What information is in the statefile that would need to protected from read or write?

ekohl · 2020-04-27T23:22:17Z

What's the current file permissions of a created statefile today?

I guess it depends on the umask, but 644 in most conditions. See theforeman/foreman#7578 (comment)

nateberkopec · 2020-04-27T23:25:57Z

Do you think we should change the default here?

ekohl · 2020-04-27T23:42:08Z

I think a default of 0640 is a more sane default but may break existing deployments. Given the security nature of it, I think that's fine though as long as there's a clear note in the changelog.

sthirugn · 2020-04-28T01:38:55Z

It's possible there are no tests for state_path. You don't have to write tests for that, but we do need tests for this.

I will look into this.

What information is in the statefile that would need to protected from read or write?

control_url, control_auth_token - these will let any user control the puma server.

sthirugn · 2020-04-29T02:29:55Z

It's possible there are no tests for state_path. You don't have to write tests for that, but we do need tests for this.

I will look into this.

Tests are added now.

nateberkopec · 2020-04-29T06:03:10Z

I'm not comfortable with changing people's file permissions w/o them setting it themselves, so I'll be merging this as-is.

Thank you so much for adding tests btw 🙇

test/test_launcher.rb

sthirugn · 2020-04-29T11:31:38Z

I'm not comfortable with changing people's file permissions w/o them setting it themselves, so I'll be merging this as-is.

Yes, that was my thought too. Lets get this optional for now and make it default in future if needed.

Thank you so much for adding tests btw bow

Absolutely!

sthirugn · 2020-04-29T11:51:32Z

Squashed commits and rebased with master.

sthirugn · 2020-04-29T14:02:19Z

no idea why File.unlink is failing in windows. I don't have experience or access to windows machines to troubleshoot this. Does anyone else have any insights into this?

ekohl

Alternative:

require 'tmpdir'
Dir.mktmpdir do |dir|
  tmp_file = File.join(tmp_file, 'puma.state')

  # ... rest of the code
end

This means you don't need to think about cleanup. An additional benefit is that you're sure that the file doesn't exist beforehand. Thinking about that also triggered another review comment.

ekohl · 2020-04-29T14:17:51Z

lib/puma/state_file.rb

      File.write path, YAML.dump(@options)
+      File.chmod(permission, path) if permission


There's a race condition here: the file is created possibly insecure and then fixed. A more secure way is to ensure permissions before writing. For example (untested):

Suggested change

File.write path, YAML.dump(@options)

File.chmod(permission, path) if permission

if permission

FileUtils.touch(path)

File.chmod(permission, path)

end

File.write path, YAML.dump(@options)

I believe you can do this in a single transaction block that might be a bit more clean:

File.open(path) do |file| file.chmod(permission) if permission file.write(YAML.dump(@options)) end

nateberkopec · 2020-04-30T03:12:40Z

Appreciate your thoughtful reviews @ekohl 🙏

test/test_launcher.rb

sthirugn · 2020-05-01T16:49:14Z

Review comments updated, commits squashed.

sthirugn · 2020-05-01T17:43:13Z

It looks 2 of the windows tests are failing, I will check

MSP-Greg · 2020-05-01T17:55:24Z

@sthirugn

JFYI, Windows testing of Ruby was non-existent with Ruby 2.2 and 2.3. The issue is whatever is creating the paths like:
d:/a/_temp/d:/a/_temp/d20200501-5716-u567s/puma-state20200501-5716-ze77jb

See:
https://github.com/puma/puma/pull/2238/checks?check_run_id=636932635#step:7:87

Not sure where it's happening...

sthirugn · 2020-05-01T22:21:10Z

I spent a good amount of time looking into the windows 2.2/2.3 failures and figured Dir.mktmpdir was not playing well with it. So I reverted the Dir.mktmpdir changes and went back to the old method of creating temp files which seems to work fine now.

Now all the commits are squashed and PR rebased. Let me know if any questions.

Before this commit, it was possible that the puma.state file would be world readable which may not be desirable in production environments. This introduces a new optional configuration option to set desired state file permissions.

sthirugn · 2020-05-01T23:06:33Z

it doesn't look like the mac 2.7 failure is related to this PR.

sthirugn · 2020-05-04T15:42:42Z

I don't have permissions to remove waiting-for-changes label.

sthirugn · 2020-05-05T16:43:35Z

@nateberkopec @ekohl let me know what you think about the recent changes. Our foreman PR is blocked on this. Any help is appreciated to get this going and get merged. Thanks

ekohl

Looks good to me, but I'm not a maintainer on this project so I might be missing things.

sthirugn · 2020-05-06T22:10:09Z

thank you @ekohl @ehelms.

@nateberkopec let me know if you need anything before merging this.

nateberkopec · 2020-05-07T03:13:27Z

Thanks for the PR and thanks for the reviews @ekohl and @ehelms

sthirugn · 2020-05-07T04:13:42Z

thank you @nateberkopec

ehelms · 2020-05-07T12:30:30Z

Thanks @nateberkopec ! To help us with planning, when do you think we will see a release with this fix in it?

ehelms · 2020-06-17T12:01:15Z

@nateberkopec Any chance we could get a 4.3.6 with this change in it? the @theforeman project would be grateful

sthirugn mentioned this pull request Apr 27, 2020

Fixes #29507 - Add puma-status for reporting theforeman/foreman#7578

Closed

dentarg reviewed Apr 27, 2020

View reviewed changes

History.md Outdated Show resolved Hide resolved

sthirugn force-pushed the state_file_perm_update branch from 824dfd1 to 0402537 Compare April 27, 2020 21:25

sthirugn force-pushed the state_file_perm_update branch from 0402537 to 10758b5 Compare April 27, 2020 22:01

ekohl reviewed Apr 27, 2020

View reviewed changes

lib/puma/dsl.rb Outdated Show resolved Hide resolved

nateberkopec added the feature label Apr 27, 2020

nateberkopec reviewed Apr 27, 2020

View reviewed changes

nateberkopec added the waiting-for-changes Waiting on changes from the requestor label Apr 27, 2020

sthirugn force-pushed the state_file_perm_update branch 2 times, most recently from b8f0423 to 9cd118b Compare April 28, 2020 01:35

nateberkopec reviewed Apr 29, 2020

View reviewed changes

test/test_launcher.rb Show resolved Hide resolved

nateberkopec reviewed Apr 29, 2020

View reviewed changes

test/test_launcher.rb Show resolved Hide resolved

ekohl reviewed Apr 29, 2020

View reviewed changes

test/test_launcher.rb Show resolved Hide resolved

sthirugn force-pushed the state_file_perm_update branch 3 times, most recently from eeda1b9 to ad8a4c4 Compare April 29, 2020 11:51

ekohl reviewed Apr 29, 2020

View reviewed changes

ekohl reviewed May 1, 2020

View reviewed changes

test/test_launcher.rb Outdated Show resolved Hide resolved

sthirugn force-pushed the state_file_perm_update branch 2 times, most recently from 4c09b5c to 84a28bd Compare May 1, 2020 16:47

sthirugn force-pushed the state_file_perm_update branch from 58287b2 to df8984e Compare May 1, 2020 22:15

Add optional state file permissions

cc05732

Before this commit, it was possible that the puma.state file would be world readable which may not be desirable in production environments. This introduces a new optional configuration option to set desired state file permissions.

sthirugn force-pushed the state_file_perm_update branch from df8984e to cc05732 Compare May 1, 2020 22:23

sthirugn requested a review from nateberkopec May 4, 2020 14:04

ekohl approved these changes May 5, 2020

View reviewed changes

ehelms approved these changes May 6, 2020

View reviewed changes

nateberkopec closed this May 7, 2020

nateberkopec reopened this May 7, 2020

nateberkopec merged commit 3060a75 into puma:master May 7, 2020

sthirugn deleted the state_file_perm_update branch May 7, 2020 04:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add optional state file permissions #2238

Add optional state file permissions #2238

sthirugn commented Apr 27, 2020 •

edited

Loading

dentarg commented Apr 27, 2020

sthirugn commented Apr 27, 2020

nateberkopec Apr 27, 2020

nateberkopec commented Apr 27, 2020

ekohl commented Apr 27, 2020

nateberkopec commented Apr 27, 2020

ekohl commented Apr 27, 2020

sthirugn commented Apr 28, 2020

sthirugn commented Apr 29, 2020

nateberkopec commented Apr 29, 2020

sthirugn commented Apr 29, 2020

sthirugn commented Apr 29, 2020

sthirugn commented Apr 29, 2020

ekohl left a comment

ekohl Apr 29, 2020

ehelms May 1, 2020

nateberkopec commented Apr 30, 2020

sthirugn commented May 1, 2020

sthirugn commented May 1, 2020

MSP-Greg commented May 1, 2020

sthirugn commented May 1, 2020

sthirugn commented May 1, 2020

sthirugn commented May 4, 2020

sthirugn commented May 5, 2020

ekohl left a comment

sthirugn commented May 6, 2020

nateberkopec commented May 7, 2020

sthirugn commented May 7, 2020

ehelms commented May 7, 2020

ehelms commented Jun 17, 2020

		File.write path, YAML.dump(@options)
		File.chmod(permission, path) if permission

Add optional state file permissions #2238

Add optional state file permissions #2238

Conversation

sthirugn commented Apr 27, 2020 • edited Loading

Description

Your checklist for this pull request

dentarg commented Apr 27, 2020

sthirugn commented Apr 27, 2020

nateberkopec Apr 27, 2020

Choose a reason for hiding this comment

nateberkopec commented Apr 27, 2020

ekohl commented Apr 27, 2020

nateberkopec commented Apr 27, 2020

ekohl commented Apr 27, 2020

sthirugn commented Apr 28, 2020

sthirugn commented Apr 29, 2020

nateberkopec commented Apr 29, 2020

sthirugn commented Apr 29, 2020

sthirugn commented Apr 29, 2020

sthirugn commented Apr 29, 2020

ekohl left a comment

Choose a reason for hiding this comment

ekohl Apr 29, 2020

Choose a reason for hiding this comment

ehelms May 1, 2020

Choose a reason for hiding this comment

nateberkopec commented Apr 30, 2020

sthirugn commented May 1, 2020

sthirugn commented May 1, 2020

MSP-Greg commented May 1, 2020

sthirugn commented May 1, 2020

sthirugn commented May 1, 2020

sthirugn commented May 4, 2020

sthirugn commented May 5, 2020

ekohl left a comment

Choose a reason for hiding this comment

sthirugn commented May 6, 2020

nateberkopec commented May 7, 2020

sthirugn commented May 7, 2020

ehelms commented May 7, 2020

ehelms commented Jun 17, 2020

sthirugn commented Apr 27, 2020 •

edited

Loading