Adding logic for `FILE_SUPERSEDE` by ibeckermayer · Pull Request #12829 · gravitational/teleport

ibeckermayer · 2022-05-23T14:45:29Z

I mistakenly forgot to fill this out in #12665. This logic was moved into its own function in #12750, so I'm branching off of there to avoid merge-chaos.

…and cliprdr::Client's have the vchan::Client as a field.

…esponse

…o trigger it by right-clicking, however it isn't working. One reason is that the vchannel PDU header isn't being added (see rdpdr::encode_message for how that's added to other messages). Noticing that made me notice that there is another cliprdr function for breaking outgoing messages into chunks that should be refactored into vchan to do that work + add the necessary vchan headers. This is a checkpoint commit while I go attend to that.

…ction

…lient parses the DeviceCreateRequest that's immediately sent back

…_CLOSE

…ugh in most cases, no need to neurotically add every bit of the documentation text to the code itself

zmb3 · 2022-06-13T22:18:50Z

                    // https://github.com/FreeRDP/FreeRDP/blob/511444a65e7aa2f537c5e531fa68157a50c1bd4d/winpr/libwinpr/file/file.c#L781
                    if rdp_req.create_disposition == flags::CreateDisposition::FILE_SUPERSEDE {
                        // If the file already exists, replace it with the given file. If it does not, create the given file.
+                        if res.err_code == TdpErrCode::Nil {


I'm confused, don't you have an error code for already exists? (TdpErrCode::AE)

Why are you not checking for that?

According to my current spec, that error is only sent back if we try a Shared Directory Create Request but the file already exists. I could rewrite this to try a Shared Directory Create Request and then do a tdp_sd_overwrite if request's res.err_code == TdpErrCode::AE, but that would be an extra roundtrip for information (whether or not this file exists) that we already have from the original Shared Directory Info Request:

teleport/lib/srv/desktop/rdp/rdpclient/src/rdpdr/mod.rs

Lines 318 to 322 in ab54ef5

// Send a TDP Shared Directory Info Request

// https://github.com/FreeRDP/FreeRDP/blob/511444a65e7aa2f537c5e531fa68157a50c1bd4d/channels/drive/client/drive_file.c#L210

let tdp_req = SharedDirectoryInfoRequest::from(rdp_req.clone());

debug!("sending TDP: {:?}", tdp_req);

(self.tdp_sd_info_request)(tdp_req)?;

…-SUPERSEDE

* `IRP_MJ_CREATE` (#12665) * `IRP_MJ_QUERY_INFORMATION` (#12717) * `IRP_MJ_CLOSE` (#12729) * Refactor rdpdr client (#12750) * Adding logic for `FILE_SUPERSEDE` (#12829) * Improve `process_irp_create` (#12830) * adds return statements that got lost in a merge * `IRP_MJ_DIRECTORY_CONTROL` (#12870) * `FileFullDirectoryInformation` (#12908) * Improve `ClientDriveQueryDirectoryResponse.encode()` (#12912) * `IRP_MJ_QUERY_VOLUME_INFORMATION` (#13071) * Fix Shared Directory Request handling when feature is disabled (#13439) * IRP_MJ_READ, IRP_MJ_WRITE, and IRP_MJ_SET_INFORMATION (#13995) * Adds constants for sizing calculations (#14051) Co-authored-by: Łukasz Kozłowski <lukasz.kozlowski@goteleport.com> Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com>

…ring) (#15770) * Windows Desktop Directory Sharing (#13630) * `IRP_MJ_CREATE` (#12665) * `IRP_MJ_QUERY_INFORMATION` (#12717) * `IRP_MJ_CLOSE` (#12729) * Refactor rdpdr client (#12750) * Adding logic for `FILE_SUPERSEDE` (#12829) * Improve `process_irp_create` (#12830) * adds return statements that got lost in a merge * `IRP_MJ_DIRECTORY_CONTROL` (#12870) * `FileFullDirectoryInformation` (#12908) * Improve `ClientDriveQueryDirectoryResponse.encode()` (#12912) * `IRP_MJ_QUERY_VOLUME_INFORMATION` (#13071) * Fix Shared Directory Request handling when feature is disabled (#13439) * IRP_MJ_READ, IRP_MJ_WRITE, and IRP_MJ_SET_INFORMATION (#13995) * Adds constants for sizing calculations (#14051) Co-authored-by: Łukasz Kozłowski <lukasz.kozlowski@goteleport.com> Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> * `UnixPath` and `WindowsPath` (#14267) * `SharedDirectoryMoveRequest` and `SharedDirectoryMoveResponse` (#14959) * `SharedDirectoryCreateResponse` update (#15289) * Fix `process_irp_set_information` (#15364) * Sanitize Rust Debug Logs (#15743) * updates rdp-rs ref to include licensing changes * Updates rdp-rs ref and fixes Cargo Co-authored-by: Łukasz Kozłowski <lukasz.kozlowski@goteleport.com> Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com>

Isaiah Becker-Mayer added 30 commits March 31, 2022 15:35

Creates a general vchan Client that can read chunked messages. rdpdr …

24c1a90

…and cliprdr::Client's have the vchan::Client as a field.

Tidying up

41ac367

Merge branch 'master' into isaiah/reuse-vchan-read

58cac52

small fixes

fa3531f

Merge branch 'master' into isaiah/reuse-vchan-read

ab4d66d

fixes linting errors

aaa8369

Merge branch 'master' into isaiah/reuse-vchan-read

54b7e3d

Merge branch 'master' into isaiah/reuse-vchan-read

071620b

Merge branch 'master' into isaiah/reuse-vchan-read

52a3d5d

Adds drive redirection capability set to the Client Core Capability R…

ceddf84

…esponse

Adds to_unicode util

9036618

refactor of vchan and rdpdr to use it

770f6e7

refactors cliprdr to use generalized vchan header and chunking

17a35e8

nits

c946b52

Merge branch 'master' into isaiah/reuse-vchan-write

787b67e

small fixes from CR

6cd9ac2

Merge branch 'master' into isaiah/reuse-vchan-write

997b7d6

Merge branch 'isaiah/reuse-vchan-write' into isaiah/mock-drive-redire…

eb8ed1a

…ction

A right click sends an ClientDeviceListAnnounce message and the rdp c…

54b53d0

…lient parses the DeviceCreateRequest that's immediately sent back

adds prototype logic for handling IRP_MJ_QUERY_INFORMATION and IRP_MJ…

8f1ead3

…_CLOSE

removes some un needed comments. the link to the documentation is eno…

9a88738

…ugh in most cases, no need to neurotically add every bit of the documentation text to the code itself

Successfully mocks a drive for redirection

fb60ebb

adding important todo

51f83e5

removes unneeded pub decl

b4192a6

refactors rdpdr into its own self-contained folder module

6cf694a

moving scard into rdpdr

fa0d555

allowing dead code

4b9c330

stubs out request_file_info

66eb895

fixes mismatched declaration

687b84c

Isaiah Becker-Mayer added 5 commits May 19, 2022 14:09

fixing clippy errors

7e4986f

Merge branch 'isaiah/irp-mj-close' into isaiah/irp-mj-refactor

cde94ea

fixing clippy errors

bd86280

fixing Makefile

1abfd00

Adding logic for FILE_SUPERSEDE

ab54ef5

ibeckermayer requested review from LKozlowski and zmb3 May 23, 2022 14:45

github-actions Bot added desktop-access rdp labels May 23, 2022

github-actions Bot requested review from marcoandredinis and probakowski May 23, 2022 14:45

ibeckermayer mentioned this pull request May 23, 2022

IRP_MJ_CREATE #12665

Merged

xacrimon approved these changes May 23, 2022

View reviewed changes

ibeckermayer removed request for marcoandredinis and probakowski May 23, 2022 14:59

LKozlowski approved these changes May 26, 2022

View reviewed changes

zmb3 reviewed Jun 13, 2022

View reviewed changes

ibeckermayer changed the base branch from isaiah/irp-mj-refactor to windows-desktop-directory-sharing June 25, 2022 00:26

ibeckermayer changed the base branch from windows-desktop-directory-sharing to isaiah/irp-mj-refactor June 25, 2022 00:26

ibeckermayer changed the base branch from isaiah/irp-mj-refactor to windows-desktop-directory-sharing June 27, 2022 13:46

Merge branch 'windows-desktop-directory-sharing' into isaiah/add-FILE…

9a9eb22

…-SUPERSEDE

ibeckermayer requested a review from zmb3 June 27, 2022 14:18

zmb3 approved these changes Jun 28, 2022

View reviewed changes

ibeckermayer merged commit 8a3153b into windows-desktop-directory-sharing Jun 28, 2022

ibeckermayer pushed a commit that referenced this pull request Jul 6, 2022

Adding logic for FILE_SUPERSEDE (#12829)

6a4ec1a

ibeckermayer pushed a commit that referenced this pull request Jul 13, 2022

Adding logic for FILE_SUPERSEDE (#12829)

17ba911

rosstimothy deleted the isaiah/add-FILE-SUPERSEDE branch December 18, 2025 15:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding logic for `FILE_SUPERSEDE`#12829

Adding logic for `FILE_SUPERSEDE`#12829
ibeckermayer merged 121 commits intowindows-desktop-directory-sharingfrom
isaiah/add-FILE-SUPERSEDE

ibeckermayer commented May 23, 2022

Uh oh!

zmb3 Jun 13, 2022

Uh oh!

ibeckermayer Jun 27, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	// Send a TDP Shared Directory Info Request
	// https://github.com/FreeRDP/FreeRDP/blob/511444a65e7aa2f537c5e531fa68157a50c1bd4d/channels/drive/client/drive_file.c#L210
	let tdp_req = SharedDirectoryInfoRequest::from(rdp_req.clone());
	debug!("sending TDP: {:?}", tdp_req);
	(self.tdp_sd_info_request)(tdp_req)?;

Conversation

ibeckermayer commented May 23, 2022

Uh oh!

zmb3 Jun 13, 2022

Choose a reason for hiding this comment

Uh oh!

ibeckermayer Jun 27, 2022 • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ibeckermayer Jun 27, 2022 •

edited

Loading