Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[httputil] add ReadHeaderTimeout #3550

Merged
merged 4 commits into from
Jul 19, 2022
Merged

Conversation

dustinxie
Copy link
Member

Description

similar to 0d72eb7, need to fix httputil as well

Fixes #3538

Type of change

Please delete options that are not relevant.

  • [] Bug fix (non-breaking change which fixes an issue)
  • [] New feature (non-breaking change which adds functionality)
  • Code refactor or improvement
  • [] Breaking change (fix or feature that would cause a new or changed behavior of existing functionality)
  • [] This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • make test
  • [] fullsync
  • [] Other test (please specify)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@dustinxie dustinxie requested a review from a team as a code owner July 14, 2022 17:23
@codecov
Copy link

codecov bot commented Jul 14, 2022

Codecov Report

Merging #3550 (63025c5) into master (a20e489) will decrease coverage by 1.34%.
The diff coverage is 44.05%.

❗ Current head 63025c5 differs from pull request most recent head a01fbbb. Consider uploading reports for the commit a01fbbb to get more accurate results

@@            Coverage Diff             @@
##           master    #3550      +/-   ##
==========================================
- Coverage   75.43%   74.08%   -1.35%     
==========================================
  Files         247      253       +6     
  Lines       22845    23326     +481     
==========================================
+ Hits        17233    17282      +49     
- Misses       4685     5118     +433     
+ Partials      927      926       -1     
Impacted Files Coverage Δ
action/protocol/staking/read_state.go 15.38% <0.00%> (ø)
api/grpcserver.go 79.49% <ø> (+0.55%) ⬆️
blockchain/blockchain.go 0.89% <0.00%> (ø)
blockchain/pubsubmanager.go 0.00% <0.00%> (ø)
config/config.go 94.06% <ø> (+9.31%) ⬆️
consensus/scheme/rolldpos/rolldposctx.go 73.96% <0.00%> (+0.30%) ⬆️
ioctl/newcmd/alias/alias.go 0.00% <0.00%> (ø)
ioctl/newcmd/bc/bc.go 37.50% <0.00%> (+0.46%) ⬆️
ioctl/util/util.go 40.00% <0.00%> (ø)
ioctl/newcmd/action/action.go 20.62% <20.62%> (ø)
... and 46 more

@@ -9,20 +9,51 @@ import (
)

const (
Copy link
Member

@Liuhaai Liuhaai Jul 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add as the default conf instead of const?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated in 2nd commit

}

// HeaderTimeout sets header timeout
func HeaderTimeout(h time.Duration) ServerOption {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReadHeaderTimeout()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in 3rd commit

mux := http.NewServeMux()
mux.Handle("/"+route, handler)
svr.svr.Handler = mux
return svr

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comment on l30

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in 3rd commit

@dustinxie dustinxie merged commit 4014325 into iotexproject:master Jul 19, 2022
pocockn added a commit to pocockn/iotex-core that referenced this pull request Jul 20, 2022
…task/set-config

* 'task/set-config' of github.com:pocockn/iotex-core:
  [test] Disable workingset cache in the benchmark test (iotexproject#3558)
  [pkg] fix  deferring unsafe method "Close" on type "*os.File" (iotexproject#3548)
  [action] Refactor handleTransfer() (iotexproject#3557)
  Add MinVersion in tls.Config (iotexproject#3562)
  [ioctl] Modify file permission as 0600 (iotexproject#3563)
  [httputil] add ReadHeaderTimeout (iotexproject#3550)
  [staking] unexport namespace (iotexproject#3551)
  move chanid metrics to chainservice (iotexproject#3544)
  [ioctl] fix log entries created from user input (iotexproject#3546)
  add log in rolldposctx (iotexproject#3553)
  fix uncontrolled data used in path expression (iotexproject#3547)
  [api] impl. TestGrpcServer_GetServerMeta (iotexproject#3559)
  [ioctl] Build action command line into new ioctl (iotexproject#3472)
  fix potential file inclusion via variable (iotexproject#3549)
dustinxie added a commit that referenced this pull request Oct 5, 2022
pocockn added a commit to pocockn/iotex-core that referenced this pull request Jun 3, 2023
* upstream/master: (45 commits)
  Task: Get config cmd (iotexproject#3552)
  [ioctl] fix  Errors unhandled (iotexproject#3567)
  fix dir permission and file inclusion (iotexproject#3566)
  [test] Disable workingset cache in the benchmark test (iotexproject#3558)
  [pkg] fix  deferring unsafe method "Close" on type "*os.File" (iotexproject#3548)
  [action] Refactor handleTransfer() (iotexproject#3557)
  Add MinVersion in tls.Config (iotexproject#3562)
  [ioctl] Modify file permission as 0600 (iotexproject#3563)
  [httputil] add ReadHeaderTimeout (iotexproject#3550)
  [staking] unexport namespace (iotexproject#3551)
  move chanid metrics to chainservice (iotexproject#3544)
  [ioctl] fix log entries created from user input (iotexproject#3546)
  add log in rolldposctx (iotexproject#3553)
  fix uncontrolled data used in path expression (iotexproject#3547)
  [api] impl. TestGrpcServer_GetServerMeta (iotexproject#3559)
  [ioctl] Build action command line into new ioctl (iotexproject#3472)
  fix potential file inclusion via variable (iotexproject#3549)
  [ioctl] Incorrect conversion between integer types (iotexproject#3522)
  [action] fix incorrect conversion between integer types (iotexproject#3545)
  [test] fix TestLoadBlockchainfromDB (iotexproject#3521)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Potential Slowloris Attack because ReadHeaderTimeout is not configured in the http.Server
3 participants