Skip to content

Commit c85f0a7

Browse files
advay26advay26
authored
Merge pull request #9805 from NuGet/main
[ReleasePrep][2024.02.14]FI of main into dev
2 parents 4b17d97 + 4a8b40f commit c85f0a7

2 files changed

Lines changed: 21 additions & 43 deletions

File tree

‎src/NuGetGallery/GalleryConstants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static class GalleryConstants
2424
public const int GravatarCacheDurationSeconds = 300;
2525

2626
public const int MaxFileLengthBytes = 1024 * 1024; // 1MB for License, Icon, readme file
27-
internal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion("6.6.0.0");
27+
internal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion("6.9.1.0");
2828

2929
public const string RecentSortOrder = "package-created";
3030

‎src/NuGetGallery/Views/Packages/ReportAbuse.cshtml‎

Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@
3838
</text>
3939
)
4040

41-
<h2><strong>To report a security vulnerability</strong></h2>
41+
<h2><strong>To report a security vulnerability or copyright/trademark infringement</strong></h2>
4242
@ViewHelpers.AlertWarning(isAlertRole: true, htmlContent:
4343
@<text>
44-
Please report security vulnerabilities through the <a href="https://msrc.microsoft.com/create-report" title="report a security vulnerability">official portal</a>.
45-
If this is not a Microsoft - owned package, consider also <a href="@Url.ContactOwners(Model)" title="contact the owners">contacting the owners</a>.
44+
Please report security vulnerabilities through the <a href="https://msrc.microsoft.com/create-report" title="report a security vulnerability">official security vulnerabilities portal</a>.
45+
Please report copyright/trademark infringements through the <a href="https://msrc.microsoft.com/report/infringement" title="Notice of Copyright or Trademark Infringment">official copyright/trademark infringement portal</a>.
46+
<br />
47+
<br />
48+
If this is not a Microsoft-owned package, consider also <a href="@Url.ContactOwners(Model)" title="contact the owners">contacting the owners</a>.
4649
</text>
4750
)
4851

@@ -80,7 +83,13 @@
8083
<div class="reason-error-security-vulnerability" tabindex="0">
8184
<p>
8285
Please report security vulnerabilities through the <a href="https://msrc.microsoft.com/create-report" title="report a security vulnerability">official portal</a>.
83-
If this is not a Microsoft - owned package, consider also <a href="@Url.ContactOwners(Model)" title="contact the owners">contacting the owners</a>.
86+
If this is not a Microsoft-owned package, consider also <a href="@Url.ContactOwners(Model)" title="contact the owners">contacting the owners</a>.
87+
</p>
88+
</div>
89+
<div class="reason-error-copyright-infringement" tabindex="0">
90+
<p>
91+
Please report copyright/trademark infringements through the <a href="https://msrc.microsoft.com/report/infringement" title="Notice of Copyright or Trademark Infringment">official portal</a>.
92+
If this is not a Microsoft-owned package, consider also <a href="@Url.ContactOwners(Model)" title="contact the owners">contacting the owners</a>.
8493
</p>
8594
</div>
8695
<div class="reason-error-revenge-porn" tabindex="0">
@@ -113,11 +122,6 @@
113122
</ul>
114123
</p>
115124
</div>
116-
<div class="infringement-claim-requirements" tabindex="0">
117-
<p>
118-
If you are reporting copyright infringement, please describe the copyrighted material with particularity and provide us with information about your copyright (i.e. title of copyrighted work, URL where to view your copyrighted work, description of your copyrighted work, and any copyright registrations you may have, etc.). For trademark infringement, include the name of your trademark, registration number, and country where registered.
119-
</p>
120-
</div>
121125
<div class="imminent-harm" tabindex="0">
122126
<p>
123127
Note: please ensure when reporting this type of abuse that you've considered whether the following are present:
@@ -137,24 +141,6 @@
137141
@Html.ShowLabelFor(m => m.CopySender)
138142
@Html.ShowValidationMessagesFor(m => m.CopySender)
139143
</div>
140-
<div class="form-group infringement-claim-requirements @Html.HasErrorFor(m => m.Signature)">
141-
<h2><span style="color:red">*</span> Required Statements for infringement claims</h2>
142-
<h2>Good Faith Belief:</h2>
143-
<p>
144-
By typing my name (electronic signature), I have a good faith belief that the use of the material is not authorized by the intellectual property owner, its agent, or the law (e.g., it is not fair use).
145-
</p>
146-
<h2>Authority to Act:</h2>
147-
<p>
148-
I represent that the information in the notification is accurate, and under penalty of perjury, that I am authorized to act on behalf of the owner of an exclusive right that is allegedly infringed.
149-
</p>
150-
<h2>512(f) Acknowledgement:</h2>
151-
<p>
152-
As applicable under 17 U.S.C. 512(f), I acknowledge that I may be subject to liability for damages if I knowingly materially misrepresent that material or activity is infringing.
153-
</p>
154-
@Html.ShowLabelFor(m => m.Signature)
155-
@Html.ShowTextBoxFor(m => m.Signature)
156-
@Html.ShowValidationMessagesFor(m => m.Signature)
157-
</div>
158144
<div class="form-group">
159145
<input id="Submit" type="submit" class="btn btn-primary form-control" value="Report" />
160146
</div>
@@ -179,6 +165,7 @@
179165
// For error conditions, hide the other form fields and show error messages
180166
if (val === 'HasABugOrFailedToInstall'
181167
|| val === 'ContainsSecurityVulnerability'
168+
|| val === 'ViolatesALicenseIOwn'
182169
|| val === 'RevengePorn') {
183170
$('#report-abuse-form').hide();
184171
} else {
@@ -197,6 +184,12 @@
197184
$form.find('.reason-error-security-vulnerability').hide();
198185
}
199186
187+
if (val === 'ViolatesALicenseIOwn') {
188+
$form.find('.reason-error-copyright-infringement').show();
189+
} else {
190+
$form.find('.reason-error-copyright-infringement').hide();
191+
}
192+
200193
if (val === 'RevengePorn') {
201194
$form.find('.reason-error-revenge-porn').show();
202195
} else {
@@ -222,21 +215,6 @@
222215
} else {
223216
$form.find('.imminent-harm').hide();
224217
}
225-
226-
if (val == 'ViolatesALicenseIOwn') {
227-
$form.find('.infringement-claim-requirements').show();
228-
$('#Signature').rules("add", {
229-
required: true,
230-
maxlength: 1000,
231-
messages: {
232-
required: "Please sign using your name."
233-
}
234-
});
235-
$('#Signature').attr('data-val-required', 'Please sign using your name.');
236-
} else {
237-
$form.find('.infringement-claim-requirements').hide();
238-
$('#Signature').rules('remove', 'required');
239-
}
240218
}
241219
242220
$(function () {

0 commit comments

Comments
 (0)