From 194f7bb7e6f3dfe87398d8b9a9ea8a39dfd7e265 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Sun, 13 May 2018 16:44:14 +0200
Subject: [PATCH] Privacy matters.

---
 paste/admin.py                              |  2 +-
 paste/migrations/0002_auto_20180513_1644.py | 37 +++++++++++++++++++++
 paste/models.py                             |  2 --
 paste/templates/paste/history.html          |  2 --
 paste/templates/paste/paste-meta.html       |  2 --
 paste/views.py                              |  5 ++-
 6 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 paste/migrations/0002_auto_20180513_1644.py

diff --git a/paste/admin.py b/paste/admin.py
index 9ef2df4..8977c34 100644
--- a/paste/admin.py
+++ b/paste/admin.py
@@ -4,4 +4,4 @@ from .models import Paste
 
 @admin.register(Paste)
 class PasteAdmin(admin.ModelAdmin):
-    list_display = ('paste_time', 'slug', 'title', 'viewcount', 'paste_ip')
+    list_display = ('paste_time', 'slug', 'title', 'viewcount')
diff --git a/paste/migrations/0002_auto_20180513_1644.py b/paste/migrations/0002_auto_20180513_1644.py
new file mode 100644
index 0000000..88fcc88
--- /dev/null
+++ b/paste/migrations/0002_auto_20180513_1644.py
@@ -0,0 +1,37 @@
+# Generated by Django 2.0.5 on 2018-05-13 14:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('paste', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='paste',
+            name='paste_agent',
+        ),
+        migrations.RemoveField(
+            model_name='paste',
+            name='paste_ip',
+        ),
+        migrations.AlterField(
+            model_name='paste',
+            name='language',
+            field=models.ForeignKey(default=14, null=True, on_delete=django.db.models.deletion.SET_NULL, to='paste.Language'),
+        ),
+        migrations.AlterField(
+            model_name='paste',
+            name='lifecount',
+            field=models.IntegerField(blank=True, default=0),
+        ),
+        migrations.AlterField(
+            model_name='paste',
+            name='lifetime',
+            field=models.IntegerField(choices=[(0, 'Never expire'), (60, '1 hour'), (1440, '1 day'), (10080, '1 week'), (302400, '1 month'), (3679200, '1 year')], default=3679200),
+        ),
+    ]
diff --git a/paste/models.py b/paste/models.py
index d626b81..ead7fc7 100644
--- a/paste/models.py
+++ b/paste/models.py
@@ -48,8 +48,6 @@ class Paste(models.Model):
         settings.PASTE['max_characters'])])
     size = models.IntegerField(default=0, editable=False)
     paste_time = models.DateTimeField(default=datetime.now, editable=False)
-    paste_ip = models.GenericIPAddressField(editable=False)
-    paste_agent = models.CharField(max_length=200, editable=False)
     lifetime = models.IntegerField(default=settings.PASTE['default_lifetime'],
                                    choices=EXPIRE_CHOICES)
     lifecount = models.IntegerField(default=0, blank=True)
diff --git a/paste/templates/paste/history.html b/paste/templates/paste/history.html
index 5c6e1f3..0b2a17e 100644
--- a/paste/templates/paste/history.html
+++ b/paste/templates/paste/history.html
@@ -12,7 +12,6 @@
        <th>{% trans 'Language' %}</th>
        <th>{% trans 'Size' %}</th>
        <th>{% trans 'Paste time' %}</th>
-       <th>{% trans 'User IP' %}</th>
        <th>{% trans 'Protection' %}</th>
        <th>{% trans 'Views' %}</th>
     </tr>
@@ -25,7 +24,6 @@
         <td>{% trans paste.language.name %}</td>
         <td>{{ paste.size }}</td>
         <td>{{ paste.paste_time }}</td>
-        <td>{{ paste.paste_ip }}</td>
         <td>{% if paste.password %}<i class="icon-lock"> {% trans 'locked' %}</i>{% else %}<i class="icon-unlock"> {% trans 'open' %}</i>{% endif %}</td>
         <td>{{ paste.viewcount }}</td>
     </tr>
diff --git a/paste/templates/paste/paste-meta.html b/paste/templates/paste/paste-meta.html
index 22e3b61..75a7d45 100644
--- a/paste/templates/paste/paste-meta.html
+++ b/paste/templates/paste/paste-meta.html
@@ -7,7 +7,6 @@
    <th>{% trans 'Language' %}</th>
    <th>{% trans 'Size' %}</th>
    <th>{% trans 'Paste time' %}</th>
-   <th>{% trans 'User IP' %}</th>
    <th>{% trans 'Visibility' %}</th>
    <th>{% trans 'Protection' %}</th>
    <th>{% trans 'Views' %}</th>
@@ -18,7 +17,6 @@
     <td>{% trans paste.language.name %}</td>
     <td>{{ paste.size }}</td>
     <td>{{ paste.paste_time }}</td>
-    <td>{{ paste.paste_ip }}</td>
     <td>{% if paste.private %}<i class="icon-eye-close"> {% trans 'private' %}</i>{% else %}<i class="icon-eye-open"> {% trans 'public' %}</i>{% endif %}</td>
     <td>{% if paste.password %}<i class="icon-lock"> {% trans 'locked' %}</i>{% else %}<i class="icon-unlock"> {% trans 'open' %}</i>{% endif %}</td>
     <td>{{ paste.viewcount }}{% if paste.lifecount > 0 %}/{{ paste.lifecount }}{% endif %}</td>
diff --git a/paste/views.py b/paste/views.py
index b66dfbf..3b6be91 100644
--- a/paste/views.py
+++ b/paste/views.py
@@ -14,10 +14,9 @@ def index(request):
     """Displays form."""
     data = {'menu': 'index',
             'max_characters': settings.PASTE['max_characters']}
+    # if request.method == 'PUT':
     if request.method == 'POST':
-        paste = Paste(slug=random_id(Paste),
-                      paste_ip=request.META['REMOTE_ADDR'],
-                      paste_agent=request.META['HTTP_USER_AGENT'])
+        paste = Paste(slug=random_id(Paste))
         if request.FILES:
             for language_name, any_file in request.FILES.items():
                 break