Skip to content

internal: Reject symlinks in project-json#14402

Merged
bors merged 1 commit intorust-lang:masterfrom
Veykril:project-json-sym-link
Mar 25, 2023
Merged

internal: Reject symlinks in project-json#14402
bors merged 1 commit intorust-lang:masterfrom
Veykril:project-json-sym-link

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Mar 25, 2023

cc #14168

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2023
@Veykril
Copy link
Member Author

Veykril commented Mar 25, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2023

📌 Commit c01ba4a has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 25, 2023

⌛ Testing commit c01ba4a with merge fc84849...

@bors
Copy link
Contributor

bors commented Mar 25, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing fc84849 to master...

@bors bors merged commit fc84849 into rust-lang:master Mar 25, 2023
@sdroege
Copy link

sdroege commented Mar 27, 2023

This breaks my workflow when using meson now. Symlinked rust-project.json should only be rejected if they contain any relative paths. Otherwise there's no reason to reject them.

@Veykril
Copy link
Member Author

Veykril commented Mar 27, 2023

Ah, sorry. I'll fix that up later today (or tomorrow). (Might as well think about how we want to handle symlinks properly)

@sdroege
Copy link

sdroege commented Mar 27, 2023

No worries. I use a custom build with this change reverted for the time being :)

@woody77
Copy link
Contributor

woody77 commented Mar 28, 2023

This change also breaks the setup we use with Fuchsia, where the rust-project.json file is created in an outdir, and we symlink to that file from the project root (using a relative path symlink). All the paths in that file should be absolute paths, however.

@sdroege
Copy link

sdroege commented Mar 28, 2023

Yeah that's basically the same as my setup with meson.

@Veykril Veykril mentioned this pull request Mar 29, 2023
Merged
bors added a commit that referenced this pull request Mar 29, 2023
@bors
Auto merge of #14430 - Veykril:canonicalize-project-manifest, r=Veykril
0d1ed56 
fix: Canonicalize rust-project.json manifest path

Looked a bit more into this and I think we can do this after all, I don't see any place where this should break things
cc #14168 #14402 (comment)
@Veykril Veykril deleted the project-json-sym-link branch August 21, 2024 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Veykril @bors @sdroege @woody77 @rustbot